]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
authorSamual Lenks <samual@xonotic.org>
Sun, 10 Feb 2013 00:49:22 +0000 (19:49 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 10 Feb 2013 00:49:22 +0000 (19:49 -0500)
commit8f0f47ad72cb8977d36e9690cd958f37825097d2
treed09b2b72010dd703ebc86668ed8dd2e137492513
parent233bf6ea697790944da89272cd06af796052ff22
parent26f4f22977ac9c8069184d26d838b60e4a3c48c0
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite

Conflicts:
qcsrc/common/util.qc
qcsrc/common/util.qh
13 files changed:
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/progs.src
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/progs.src
qcsrc/server/w_electro.qc
qcsrc/server/w_shotgun.qc