]> 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: e642aac 0e42cf5)
Merge remote-tracking branch 'origin/tzork/vehicles-2'
authorRudolf Polzer <divverent@xonotic.org>
Tue, 21 Jun 2011 17:11:18 +0000 (19:11 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 21 Jun 2011 17:11:18 +0000 (19:11 +0200)
Conflicts:
qcsrc/server/ctf.qc

1  2 
qcsrc/common/constants.qh patch | diff1 | diff2 | blob | history
qcsrc/server/ctf.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/constants.qh
Simple merge
diff --cc qcsrc/server/ctf.qc
Simple merge