]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Sun, 4 Dec 2011 15:51:47 +0000 (10:51 -0500)
committerSamual <samual@xonotic.org>
Sun, 4 Dec 2011 15:51:47 +0000 (10:51 -0500)
commit046d341f40f7dc21d65976d11d7c94f0ccdde0b4
tree6a105d79a64c18ee1f948d2159c8a3883b439273
parent5d819189d2072487587e0bbba031e1f824e7f9e4
parent96d653c418485a1d27107dba9407b57a3d02e9fc
Merge remote branch 'origin/master' into samual/updatecommands
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/main.qh
qcsrc/client/progs.src
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src