]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69d9340 1db2139)
Merge branch 'master' into ast-and-ir
authorDale Weiler <killfieldengine@gmail.com>
Sun, 29 Apr 2012 20:39:43 +0000 (16:39 -0400)
committerDale Weiler <killfieldengine@gmail.com>
Sun, 29 Apr 2012 20:39:43 +0000 (16:39 -0400)

Trivial merge