]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into TimePath/guide
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 27 Sep 2015 04:36:52 +0000 (14:36 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 27 Sep 2015 04:43:18 +0000 (14:43 +1000)
commit042661314bd444ff382fcd97fc516f1bbac61b33
treeedcfbd7eb68ca54ab367d5cb46f23420238247f6
parent35bf2f4d729932e9be0df873646d4147eeac395b
parentd74c7101cf00af4ab91203c7a56f33dd1cba78db
Merge branch 'master' into TimePath/guide

# Conflicts:
# qcsrc/menu/xonotic/dialog_multiplayer_media.qc
qcsrc/common/mapinfo.qc
qcsrc/common/nades.qh
qcsrc/menu/xonotic/dialog_multiplayer_media.qc