projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 685fa54 9a1894f)
Merge branch 'master' into cooking
authorDale Weiler <killfieldengine@gmail.com>
Mon, 22 Apr 2013 00:11:31 +0000 (00:11 +0000)
committerDale Weiler <killfieldengine@gmail.com>
Mon, 22 Apr 2013 00:11:31 +0000 (00:11 +0000)

Trivial merge