Merge branch 'master' into TimePath/combined_updates
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 14 Dec 2014 01:57:53 +0000 (12:57 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 14 Dec 2014 01:57:53 +0000 (12:57 +1100)
Conflicts:
qcsrc/common/notifications.qh

1  2 
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/menu/menu.qc
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/command/vote.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge