]> 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: e79cf68 d882386)
Merge branch 'master' into Mario/ecs_halfbaked
authorMario <mario.mario@y7mail.com>
Thu, 16 Jan 2020 17:29:37 +0000 (03:29 +1000)
committerMario <mario.mario@y7mail.com>
Thu, 16 Jan 2020 17:29:37 +0000 (03:29 +1000)
1  2 
qcsrc/Makefile patch | diff1 | diff2 | blob | history
qcsrc/ecs/systems/physics.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/Makefile
Simple merge
diff --cc qcsrc/ecs/systems/physics.qc
Simple merge