]> 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: b8f3915 69fb3ad)
Merge remote branch 'origin/master' into samual/flyingspectators
authorSamual <samual@xonotic.org>
Tue, 3 May 2011 17:17:34 +0000 (13:17 -0400)
committerSamual <samual@xonotic.org>
Tue, 3 May 2011 17:17:34 +0000 (13:17 -0400)
1  2 
qcsrc/warpzonelib/server.qc patch | diff1 | diff2 | blob | history

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