]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'refs/remotes/origin/ThePWTULN/campaigntimer'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 22 Oct 2010 07:02:59 +0000 (09:02 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 22 Oct 2010 07:02:59 +0000 (09:02 +0200)
commitcb78214cf1252fa80df3490c0cd3d41bae72bbb8
tree67751c846e3b87b4c6d5906f75db843672f866f7
parent301c2eb1ecefbfca43e8a34359c83b6b06b2777e
parent669c8376ed12ed0039a6ea7eb2ed9615c03411f3
Merge remote branch 'refs/remotes/origin/ThePWTULN/campaigntimer'
qcsrc/server/g_world.qc