]> 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: 7a0a311 8d10ea8)
Merge branch 'master' into terencehill/bot_fixes
authorterencehill <piuntn@gmail.com>
Sun, 23 Aug 2015 15:33:36 +0000 (17:33 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 23 Aug 2015 15:33:36 +0000 (17:33 +0200)
1  2 
qcsrc/server/cl_client.qc patch | diff1 | diff2 | blob | history
qcsrc/server/g_damage.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/cl_client.qc
Simple merge
diff --cc qcsrc/server/g_damage.qc
Simple merge