projects / hw / telebt / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 386bfe2 bf03091)
Merge branch 'master' of ssh://git.gag.com/scm/git/hw/telebt
authorKeith Packard <keithp@keithp.com>
Thu, 11 Jul 2013 05:09:30 +0000 (22:09 -0700)
committerKeith Packard <keithp@keithp.com>
Thu, 11 Jul 2013 05:09:30 +0000 (22:09 -0700)
Signed-off-by: Keith Packard <keithp@keithp.com>
Conflicts:
telebt.sch

1  2 
telebt.sch patch | diff1 | diff2 | blob | history

diff --cc telebt.sch
Simple merge
USB and Bluetooth interface for rocketry telemetry