]> 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: 2d68def 10a6a10)
Merge branch 'master' into divVerent/csqcmodel
authorRudolf Polzer <divverent@alientrap.org>
Fri, 2 Dec 2011 08:36:03 +0000 (09:36 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 2 Dec 2011 08:36:03 +0000 (09:36 +0100)
1  2 
qcsrc/client/miscfunctions.qc patch | diff1 | diff2 | blob | history

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