]> 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: ac93b7a 12354d7)
Merge branch 'Mario/qc_physics_cleanup_v2'
authorMario <mario@smbclan.net>
Sun, 24 Jul 2016 06:38:45 +0000 (16:38 +1000)
committerMario <mario@smbclan.net>
Sun, 24 Jul 2016 06:38:45 +0000 (16:38 +1000)
1  2 
qcsrc/common/debug.qh patch | diff1 | diff2 | blob | history
qcsrc/common/weapons/weapon/arc.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/debug.qh
Simple merge
diff --cc qcsrc/common/weapons/weapon/arc.qc
Simple merge