]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into TimePath/guide
authorTimePath <andrew.hardaker1995@gmail.com>
Sat, 3 Oct 2015 09:44:35 +0000 (19:44 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sat, 3 Oct 2015 09:50:41 +0000 (19:50 +1000)
commit8644a2c1ad1d252b61aa29460166d035cf0a876b
treef50d0e612338e8fa22ac89f8841a3c173f575e14
parente14fdac759bfbddefbcd3212d45e23dff9fa7586
parente7419831cfa8df073b3f7d3184ce6914e38791d4
Merge branch 'master' into TimePath/guide
qcsrc/menu/xonotic/dialog_media_guide.qc
qcsrc/menu/xonotic/dialog_media_guide_entries.qc
qcsrc/menu/xonotic/dialog_media_guide_topics.qc