]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: c2aaebd f6de28b)
Merge branch 'master' into Mario/weapons_new
authorMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 03:27:46 +0000 (14:27 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 03:27:46 +0000 (14:27 +1100)
Conflicts:
qcsrc/client/scoreboard.qc
qcsrc/server/w_minstanex.qc


Trivial merge