diff options
| author | Wladimir J. van der Laan <[email protected]> | 2013-04-11 06:57:27 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2013-04-11 06:57:27 +0200 |
| commit | 9a4eaf3cff9d37118939e38e7ce029a71e062ee9 (patch) | |
| tree | 6fe4e640a983149739ac9fa636030d961aaad3ae /src/test/script_tests.cpp | |
| parent | Merge pull request #2487 from Diapolo/translations (diff) | |
| parent | better quality windows .ICO icon file (diff) | |
| download | discoin-9a4eaf3cff9d37118939e38e7ce029a71e062ee9.tar.xz discoin-9a4eaf3cff9d37118939e38e7ce029a71e062ee9.zip | |
Merge remote-tracking branch 'jonasschnelli/new_icons' (#2497)
Conflicts:
doc/assets-attribution.txt
Diffstat (limited to 'src/test/script_tests.cpp')
0 files changed, 0 insertions, 0 deletions