]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69333b7 2b04438)
Merge branch 'master' into TimePath/guide
authorTimePath <andrew.hardaker1995@gmail.com>
Mon, 31 Aug 2015 06:13:50 +0000 (16:13 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Mon, 31 Aug 2015 06:13:50 +0000 (16:13 +1000)
1  2 
qcsrc/common/mapinfo.qc patch | diff1 | diff2 | blob | history
qcsrc/menu/classes.inc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/mapinfo.qc
Simple merge
diff --cc qcsrc/menu/classes.inc
Simple merge