projects / bbctrl-firmware / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c80e2a 932643b)
Merge branch 'master' into skip-non-plan
authorJoseph Coffland <joseph@cauldrondevelopment.com>
Sun, 11 Sep 2016 15:22:20 +0000 (08:22 -0700)
committerJoseph Coffland <joseph@cauldrondevelopment.com>
Sun, 11 Sep 2016 15:22:20 +0000 (08:22 -0700)
1  2 
src/machine.c patch | diff1 | diff2 | blob | history

diff --cc src/machine.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.