]> 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: 2551047 a9639f0)
Merge branch 'Mario/combined_updates' into Mario/combined_viewloc
authorMario <zacjardine@y7mail.com>
Wed, 4 Mar 2015 09:42:53 +0000 (20:42 +1100)
committerMario <zacjardine@y7mail.com>
Wed, 4 Mar 2015 09:42:53 +0000 (20:42 +1100)
1  2 
qcsrc/client/main.qc patch | diff1 | diff2 | blob | history
qcsrc/client/view.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/main.qc
Simple merge
diff --cc qcsrc/client/view.qc
Simple merge