projects / librecmc / librecmc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ffe889d c0378f3)
Merge remote-tracking branch 'upstream/v1.4-stage' into v1.4-stage 3/head
authorL. D. Pinney <ldpinney@gmail.com>
Sat, 25 Feb 2017 04:01:44 +0000 (22:01 -0600)
committerL. D. Pinney <ldpinney@gmail.com>
Sat, 25 Feb 2017 04:01:44 +0000 (22:01 -0600)

Trivial merge