]> 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: a73758e 38b8816)
Merge branch 'master' into DefaultUser/waypoint_icons 528/head
authorMario <mario@smbclan.net>
Sun, 11 Feb 2018 00:33:52 +0000 (10:33 +1000)
committerMario <mario@smbclan.net>
Sun, 11 Feb 2018 00:33:52 +0000 (10:33 +1000)
1  2 
qcsrc/common/vehicles/sv_vehicles.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/vehicles/sv_vehicles.qc
Simple merge