]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff8f055 16d1fe1)
Merge remote-tracking branch 'origin/master' into divVerent/force_colors_teamplay
authorRudolf Polzer <divverent@alientrap.org>
Sat, 21 Jul 2012 19:11:50 +0000 (21:11 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 21 Jul 2012 19:11:50 +0000 (21:11 +0200)
1  2 
qcsrc/client/csqcmodel_hooks.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/csqcmodel_hooks.qc
Simple merge