]> 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: 5e43baf 62a098d)
Merge branch 'master' into Mario/respawn_delays
authorMario <mario.mario@y7mail.com>
Fri, 26 Jul 2013 14:15:27 +0000 (00:15 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 26 Jul 2013 14:15:27 +0000 (00:15 +1000)
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