| commit | c526a7572df0f5d75c48f27125ca69e0a5097c48 | |
| author | lordmulder <mulder2@gmx.de> | |
| Mon, 9 May 2011 06:35:06 +0000 (9 08:35 +0200) | ||
| committer | lordmulder <mulder2@gmx.de> | |
| Mon, 9 May 2011 06:35:06 +0000 (9 08:35 +0200) | ||
| tree | 628e3ae74191762cb4563113cfafa1cbedf07d48 | treesnapshot (tar.gz zip) |
| parent | 15d61f0dfb2c0040b3f59039e76382e8a2591ef3 | commitdiff |
| parent | 6050f8b778f7e4b8e472110faf01ae29a0c23d08 | commitdiff |
Merge branch 'master' of github.com:lordmulder/LameXP
Conflicts:
etc/Translation/Blank.ts
etc/Translation/LameXP_DE.ts
etc/Translation/LameXP_ES.ts
etc/Translation/LameXP_FR.ts
etc/Translation/LameXP_IT.ts
etc/Translation/LameXP_KR.ts
etc/Translation/LameXP_RU.ts
etc/Translation/LameXP_UK.ts
res/localization/LameXP_DE.qm
src/Config.h
Conflicts:
etc/Translation/Blank.ts
etc/Translation/LameXP_DE.ts
etc/Translation/LameXP_ES.ts
etc/Translation/LameXP_FR.ts
etc/Translation/LameXP_IT.ts
etc/Translation/LameXP_KR.ts
etc/Translation/LameXP_RU.ts
etc/Translation/LameXP_UK.ts
res/localization/LameXP_DE.qm
src/Config.h