]> de.git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 127ad76 72f3af6)
Merge branch 'irgen'
authorDale Weiler <killfieldengine@gmail.com>
Thu, 7 Jun 2012 15:24:55 +0000 (11:24 -0400)
committerDale Weiler <killfieldengine@gmail.com>
Thu, 7 Jun 2012 15:24:55 +0000 (11:24 -0400)
1  2 
gmqcc.h patch | diff1 | diff2 | blob | history

diff --cc gmqcc.h
Simple merge