Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorJan Behrens <zykure@web.de>
Fri, 10 May 2013 13:54:52 +0000 (15:54 +0200)
committerJan Behrens <zykure@web.de>
Fri, 10 May 2013 13:54:52 +0000 (15:54 +0200)
commitdd70edcca2f19a7b95b1f0441db75c154bf10606
tree61b3b3bcb397b371e9eea185a80fca5ad3c4a328
parente23e7ec535b848203e145b961384b60ced5013db
parente63ba76493751c027455b946d0b94b3a5beace47
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir