]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/terencehill/onslaught_overtime_msg'
authorRudolf Polzer <divverent@xonotic.org>
Sat, 13 Aug 2011 12:08:53 +0000 (14:08 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 13 Aug 2011 12:08:53 +0000 (14:08 +0200)
1  2 
qcsrc/server/mode_onslaught.qc

Simple merge