]> 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: 8e06b14 1670a79)
Merge remote branch 'origin/fruitiex/campaign'
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 7 Dec 2010 10:08:31 +0000 (11:08 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 7 Dec 2010 10:08:31 +0000 (11:08 +0100)
1  2 
qcsrc/server/teamplay.qc patch | diff1 | diff2 | blob | history

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