Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir into savagex/plat...
authorMaik Merten <maikmerten@googlemail.com>
Tue, 25 Jan 2011 18:24:57 +0000 (19:24 +0100)
committerMaik Merten <maikmerten@googlemail.com>
Tue, 25 Jan 2011 18:24:57 +0000 (19:24 +0100)
1  2 
qcsrc/server/g_subs.qc

Simple merge