]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into TimePath/guide
authorTimePath <andrew.hardaker1995@gmail.com>
Wed, 23 Dec 2015 03:17:21 +0000 (14:17 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Wed, 23 Dec 2015 03:32:34 +0000 (14:32 +1100)
commit0a8e001c88394e85124c67a4e195b9cbb36c1fcc
tree0cc519abd64bd8f670c91302744b8e5b927a6d2e
parent22692213b5488c88d98734858825b7ddb2b16216
parent02a6cb9ffe0f7705397f14ac2c4c3354173e9ef1
Merge branch 'master' into TimePath/guide

# Conflicts:
# qcsrc/common/nades/all.qh
# qcsrc/menu/classes.inc
qcsrc/common/mapinfo.qc
qcsrc/common/mutators/mutator/buffs/all.qh
qcsrc/common/mutators/mutator/nades/nades.inc
qcsrc/common/vehicles/vehicle.qh
qcsrc/menu/classes.inc
qcsrc/menu/progs.inc
qcsrc/menu/xonotic/guide/description.qc
qcsrc/menu/xonotic/guide/entries.qc
qcsrc/menu/xonotic/guide/pages.qh
qcsrc/menu/xonotic/guide/tab.qc
qcsrc/menu/xonotic/guide/topics.qc