]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 75c6065 fbe8645)
Merge branch 'master' into ast-and-ir
authorDale Weiler <killfieldengine@gmail.com>
Wed, 2 May 2012 19:50:50 +0000 (15:50 -0400)
committerDale Weiler <killfieldengine@gmail.com>
Wed, 2 May 2012 19:50:50 +0000 (15:50 -0400)

Trivial merge