]> 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: 992844f 900eb72)
Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Sat, 2 Oct 2010 08:46:05 +0000 (10:46 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 2 Oct 2010 08:46:05 +0000 (10:46 +0200)
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