]> 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: 87d9c65 72d8a4a)
Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Thu, 20 Oct 2011 06:54:16 +0000 (08:54 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 20 Oct 2011 06:54:16 +0000 (08:54 +0200)
1  2 
qcsrc/server/w_common.qc patch | diff1 | diff2 | blob | history

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