projects / quakecontrol.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e0bb37a 92db67c)
Merge branch 'master' of thejh.net:quakecontrol master
authorJann Horn <jannhorn@googlemail.com>
Sun, 4 May 2014 18:35:52 +0000 (20:35 +0200)
committerJann Horn <jannhorn@googlemail.com>
Sun, 4 May 2014 18:35:52 +0000 (20:35 +0200)

Trivial merge