]> 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: f4fd4cd a0bfb35)
Merge branch 'master' into Mario/vehicles
authorMario <zacjardine@y7mail.com>
Fri, 5 Dec 2014 10:39:46 +0000 (21:39 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 5 Dec 2014 10:39:46 +0000 (21:39 +1100)
1  2 
qcsrc/client/Main.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/Main.qc
Simple merge