]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Fri, 14 Dec 2012 10:16:30 +0000 (11:16 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 14 Dec 2012 10:16:30 +0000 (11:16 +0100)
commit21669f743378b255e4f984222de65be549fda772
treef9077d354f3ba1eed4c50562878fc603d5fbe1fe
parentf192c14ff0d6d3205d90f83f254ecaa637e59bbb
parentfd881f5d4d8b950a8bf896261351a2726d03247c
Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir