]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d8ae1cb cbb91c2)
Merge branch 'master' of github.com:graphitemaster/gmqcc
authorDale Weiler <killfieldengine@gmail.com>
Mon, 7 Jan 2013 12:40:03 +0000 (12:40 +0000)
committerDale Weiler <killfieldengine@gmail.com>
Mon, 7 Jan 2013 12:40:03 +0000 (12:40 +0000)
1  2 
Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge