lordmulder c526a7572d 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
2011-05-09 08:35:06 +02:00
..
2011-05-09 08:32:42 +02:00
2011-05-09 00:23:37 +02:00