]> 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: f518b28 30f70d8)
Merge branch 'fruitiex/ctsfix' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3di...
authorRudolf Polzer <divverent@alientrap.org>
Thu, 9 Dec 2010 21:50:15 +0000 (22:50 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 9 Dec 2010 21:50:15 +0000 (22:50 +0100)
1  2 
qcsrc/server/miscfunctions.qc patch | diff1 | diff2 | blob | history

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