]> 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: 73ea0b5 315d0f3)
Merge branch 'master' into divVerent/csqcmodel
authorRudolf Polzer <divverent@xonotic.org>
Fri, 9 Dec 2011 21:15:01 +0000 (22:15 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 9 Dec 2011 21:15:01 +0000 (22:15 +0100)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/server/cl_client.qc patch | diff1 | diff2 | blob | history

diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/server/cl_client.qc
Simple merge