]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Melanosuchus/minigames
authorMario <zacjardine@y7mail.com>
Thu, 26 Mar 2015 13:29:59 +0000 (00:29 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 26 Mar 2015 13:29:59 +0000 (00:29 +1100)
1  2 
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/server/cl_client.qc
qcsrc/server/command/cmd.qc
qcsrc/server/g_world.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge