projects / GitHub / Stricted / SpeedportHybridControl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69507dd fba6bae)
Merge branch 'master' into 1.0-pre12
authorStricted <info@stricted.net>
Thu, 10 Nov 2016 19:26:43 +0000 (20:26 +0100)
committerStricted <info@stricted.net>
Thu, 10 Nov 2016 19:27:14 +0000 (20:27 +0100)

Trivial merge