| commit | 2d4770e277fdb1a9016e66c3ca372304352b912a | |
| author | lordmulder <mulder2@gmx.de> | |
| Thu, 29 Sep 2011 18:07:26 +0000 (29 20:07 +0200) | ||
| committer | lordmulder <mulder2@gmx.de> | |
| Thu, 29 Sep 2011 18:07:26 +0000 (29 20:07 +0200) | ||
| tree | 33fe7042f0a526b2c83ea5cfd75f865c03803ccb | treesnapshot (tar.gz zip) |
| parent | 282528ea675233ad46fc6e42a090b9521a4364af | commitdiff |
| parent | b87e13a5eb756e54de3673bf9f725c4306bc455d | commitdiff |
Merge branch 'master' of github.com:lordmulder/LameXP
Conflicts:
src/Config.h
Conflicts:
src/Config.h
| etc/Translation/Blank.ts | diff1 | diff2 | blobhistory |
| src/Dialog_MainWindow.cpp | diff1 | diff2 | blobhistory |