]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mario/monsters
authorMario <mario.mario@y7mail.com>
Sun, 10 Feb 2013 01:34:01 +0000 (12:34 +1100)
committerMario <mario.mario@y7mail.com>
Sun, 10 Feb 2013 01:34:01 +0000 (12:34 +1100)
commitf56909500a5fc5b0719870d23b82cc3f2904f3c1
treec7cec4978dc81b082bd4a5b644e3a18d047c1fcd
parent861cca308322ccdd216e566548d17b744aaac106
parent2b39ce52fed96bf1d0eec2209c34632308590e1c
Merge branch 'master' into mario/monsters
defaultXonotic.cfg
qcsrc/server/g_world.qc