From: lordmulder <mulder2@gmx.de>
Date: Thu, 15 Nov 2012 17:13:03 +0000 (+0100)
Subject: Merge branch 'master' of github.com:lordmulder/LameXP
X-Git-Tag: Release_407~123
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4241a411cf79692b4828dc9509654c6a9ab711a6;p=lamexp%2FLameXP.git

Merge branch 'master' of github.com:lordmulder/LameXP

Conflicts:
	etc/Translation/Blank.ts
	etc/Translation/LameXP_PL.ts
	etc/Translation/LameXP_SV.ts
	src/Config.h
---

4241a411cf79692b4828dc9509654c6a9ab711a6