]> git.xonotic.org Git - xonotic/xonotic.git/commit
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@xonotic.org>
Sun, 23 Jun 2013 16:36:04 +0000 (18:36 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 23 Jun 2013 16:36:04 +0000 (18:36 +0200)
commit741d4b5ab2cb689abb6030af9e767a8958e168fb
tree307c2e6b3f3315152d32e937c57b0944886627c1
parent8d09ae1b30d6b0ab1edd8e7fa5f3f3a015c1fd35
parent100c8c4a3327809ed6c999d0dcbf226545883229
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
misc/tools/xonotic-map-compiler