diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-04-11 06:57:27 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-04-11 06:57:27 +0200 |
| commit | 9a4eaf3cff9d37118939e38e7ce029a71e062ee9 (patch) | |
| tree | 6fe4e640a983149739ac9fa636030d961aaad3ae /src/allocators.h | |
| parent | bb8bc860e3445ca22209e6cc931bc4b1c139a3a1 (diff) | |
| parent | 4c237436359f5800ef29759deac570a6f897a8b3 (diff) | |
Merge remote-tracking branch 'jonasschnelli/new_icons' (#2497)
Conflicts:
doc/assets-attribution.txt
Diffstat (limited to 'src/allocators.h')
0 files changed, 0 insertions, 0 deletions