]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into TimePath/guide
authorTimePath <andrew.hardaker1995@gmail.com>
Wed, 14 Oct 2015 23:29:49 +0000 (10:29 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Thu, 15 Oct 2015 00:00:08 +0000 (11:00 +1100)
commit22692213b5488c88d98734858825b7ddb2b16216
treed1687ef2b9d7d94cb9fb62c27925ad9c0a04711e
parent947f96fc9356f146b315c106d64dd46e95e0b195
parentcd87809f33bd8721362526e797bae16bd325faa5
Merge branch 'master' into TimePath/guide

# Conflicts:
# qcsrc/common/nades.qh
# qcsrc/common/vehicles/vehicle.qh
# qcsrc/menu/xonotic/dialog_multiplayer_media.qc
qcsrc/common/mapinfo.qc
qcsrc/common/nades/all.inc
qcsrc/common/nades/all.qh
qcsrc/common/vehicles/vehicle.qh
qcsrc/menu/progs.inc
qcsrc/menu/xonotic/dialog_multiplayer_media.qc
qcsrc/menu/xonotic/guide/pages.qh
qcsrc/menu/xonotic/guide/tab.qc