]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitbb39677b24abd8ba975139e1d1c7a59a2adef1b8
tree53d95783edadcc63022d8100bfee57fbbc772173
parent7d2d4f4e9177ef5024f9d3e1b07be6e263e46333
parentf746573dff0cedc83aa8254751fe0e6d829efc93
Merge branch 'master' into Melanosuchus/minigames
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/server/cl_client.qc
qcsrc/server/command/cmd.qc
qcsrc/server/g_world.qc