]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/weapons
authorSamual Lenks <samual@xonotic.org>
Wed, 26 Feb 2014 21:00:14 +0000 (16:00 -0500)
committerSamual Lenks <samual@xonotic.org>
Wed, 26 Feb 2014 21:00:14 +0000 (16:00 -0500)
commitf8287888da112f1cd5d711903be8f840ff9f0d70
tree49da2c5e5b43a76c3c65db1ef3aef6d77b0a5ae2
parentf0de4ddfdecaa3c48c7e061f518153d4e1507856
parent5d84c659e4c2c51c996b5330fa19c8a24887e42d
Merge remote-tracking branch 'origin/master' into samual/weapons

Conflicts:
mutators.cfg
qcsrc/common/items.qh
mutators.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/miscfunctions.qc
qcsrc/client/scoreboard.qc
qcsrc/client/waypointsprites.qc
qcsrc/server/autocvars.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutator_nades.qc