]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 682c439 ac5cc49)
Merge branch 'screwaround'
authorDale Weiler <killfieldengine@gmail.com>
Sun, 6 Jan 2013 12:29:07 +0000 (12:29 +0000)
committerDale Weiler <killfieldengine@gmail.com>
Sun, 6 Jan 2013 12:29:07 +0000 (12:29 +0000)

Trivial merge