]> 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 (from: 2b89f5b)
Merge branch 'master' into Mario/weapons
authorMario <zacjardine@y7mail.com>
Fri, 14 Nov 2014 02:05:18 +0000 (13:05 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 14 Nov 2014 02:05:18 +0000 (13:05 +1100)
Conflicts:
mutators.cfg
qcsrc/client/hud.qc
qcsrc/client/waypointsprites.qc
qcsrc/common/constants.qh
qcsrc/common/notifications.qh
qcsrc/server/cl_weapons.qc
qcsrc/server/mutators/mutator_nades.qc
qcsrc/server/progs.src
qcsrc/server/w_electro.qc
qcsrc/server/w_minelayer.qc


No differences found