]> git.rm.cloudns.org Git - xonotic/gmqcc.git/commitdiff
Merge branch 'cleanup' of git://github.com/graphitemaster/gmqcc into cleanup
authorWolfgang Bumiller <wry.git@bumiller.com>
Sun, 1 Feb 2015 11:13:59 +0000 (12:13 +0100)
committerWolfgang Bumiller <wry.git@bumiller.com>
Sun, 1 Feb 2015 11:13:59 +0000 (12:13 +0100)
1  2 
fold.cpp
ir.cpp

diff --cc fold.cpp
Simple merge
diff --cc ir.cpp
Simple merge