]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/flyingspectators
authorSamual <samual@xonotic.org>
Tue, 16 Aug 2011 19:35:49 +0000 (15:35 -0400)
committerSamual <samual@xonotic.org>
Tue, 16 Aug 2011 19:35:49 +0000 (15:35 -0400)
commite29603d545018c97349769107c7541212dc65cd3
treee59375081550a3c20484a584a80e83ea1cf5f412
parent89b16441c4f6920f8cdba7ffe69e34095473e80a
parentd17eaa6d6ed46e500a49bf04e336e1a4379a9457
Merge remote branch 'origin/master' into samual/flyingspectators

Conflicts:
qcsrc/server/defs.qh
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc