]> 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: 08d0eef 4b71223)
Merge branch 'master' into Mario/combined_updates
authorMario <zacjardine@y7mail.com>
Tue, 31 Mar 2015 15:41:07 +0000 (02:41 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 31 Mar 2015 15:41:07 +0000 (02:41 +1100)
Conflicts:
qcsrc/server/mutators/mutator_instagib.qc

1  2 
qcsrc/client/view.qc patch | diff1 | diff2 | blob | history
qcsrc/server/autocvars.qh patch | diff1 | diff2 | blob | history
qcsrc/server/mutators/mutator_nades.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/view.qc
Simple merge
diff --cc qcsrc/server/autocvars.qh
Simple merge