Merge remote-tracking branch 'origin/latest-nanopb' into passthrough-command
authorChristopher Peplin <chris.peplin@rhubarbtech.com>
Sun, 21 Sep 2014 01:58:35 +0000 (21:58 -0400)
committerChristopher Peplin <chris.peplin@rhubarbtech.com>
Sun, 21 Sep 2014 01:59:11 +0000 (21:59 -0400)
commitb2692a38bffa2c223f62b0aab5ce2c510fdefa30
treefcff67d496cfc5f5c50af4d1c2f266f6190c2ab3
parent625dae730013a4c59a1bd0bacc1f743676274e24
parent75ec5e7c6bf86b6af90168d8e39b3404f4ce6b1e
Merge remote-tracking branch 'origin/latest-nanopb' into passthrough-command

Conflicts:
gen/cpp/openxc.pb.c
gen/cpp/openxc.pb.h
gen/cpp/openxc.pb.c
gen/cpp/openxc.pb.h