Merge remote-tracking branch 'origin/master' into samual/weapons
authorSamual Lenks <samual@xonotic.org>
Sun, 5 Jan 2014 03:36:30 +0000 (22:36 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 5 Jan 2014 03:36:30 +0000 (22:36 -0500)
commit9e9ae52d6c468d5bbd43df53e54fc8d6c7276175
tree6060f547722b8d2755e1e75755dbe2a78a686713
parentfe74152d8d0e11d2ad20bb05102dfd8fbd7adf9f
parente23579dcf3caf46f7d186bfc4b641458b36b5365
Merge remote-tracking branch 'origin/master' into samual/weapons
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/common/notifications.qh