]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d6594a 50f00fb)
Merge remote-tracking branch 'origin/ast-and-ir' into ast-and-ir
authorDale Weiler <killfieldengine@gmail.com>
Sat, 28 Apr 2012 10:32:32 +0000 (06:32 -0400)
committerDale Weiler <killfieldengine@gmail.com>
Sat, 28 Apr 2012 10:32:32 +0000 (06:32 -0400)

Trivial merge