]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into TimePath/guide
authorTimePath <andrew.hardaker1995@gmail.com>
Mon, 24 Aug 2015 03:03:57 +0000 (13:03 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Mon, 24 Aug 2015 03:12:06 +0000 (13:12 +1000)
commite68c2c11558605fc7bc12a37f6317f28ae8143fc
tree7bd8ca66207987952146d0cb437122d8ad503c27
parent27809ca88ef9b689b6c7575af54fa222ca20a1cb
parent8d10ea819c27736320d03e75134af341f8127199
Merge branch 'master' into TimePath/guide
12 files changed:
qcsrc/common/buffs.qh
qcsrc/common/items/item.qh
qcsrc/common/mapinfo.qh
qcsrc/common/nades.qh
qcsrc/common/oo.qh
qcsrc/common/weapons/all.qh
qcsrc/menu/xonotic/datasource.qc
qcsrc/menu/xonotic/dialog_media_guide.qc
qcsrc/menu/xonotic/dialog_media_guide_description.qc
qcsrc/menu/xonotic/dialog_media_guide_entries.qc
qcsrc/menu/xonotic/dialog_media_guide_topics.qc
qcsrc/menu/xonotic/dialog_multiplayer_media.qc