]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.c
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)
commitdc25d591f448c6ed191fcf9452d65b87d7a26e90
tree7a3504c860401dacf0b58420899e19490d2cfea4
parent094f9682a7e8258a383ea9574dc7144eaf7ceecc
parente3c9859a793a28cc209319becdb467b711d761d0
Merge branch 'master' into TimePath/combined_updates

Conflicts:
qcsrc/common/notifications.qh
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