]> 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: 4f898eb 02e0727)
Merge branch 'master' into Mario/triggers
authorMario <zacjardine@y7mail.com>
Wed, 5 Aug 2015 11:48:39 +0000 (21:48 +1000)
committerMario <zacjardine@y7mail.com>
Wed, 5 Aug 2015 11:48:39 +0000 (21:48 +1000)
1  2 
qcsrc/client/view.qc patch | diff1 | diff2 | blob | history

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