]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 936b469 21707cb)
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 patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/mode_onslaught.qc
Simple merge