Merge branch 'master' of github.com:PX4/Firmware into swissfang

2014-08-30 15:09:40 +02:00 · 2014-08-30 15:09:40 +02:00 · b53c0d6d7f
parent 37910d2230 593df0ae12
commit b53c0d6d7f
2 changed files with 3 additions and 1 deletions
--- a/src/modules/uavcan/uavcan_clock.cpp
+++ b/src/modules/uavcan/uavcan_clock.cpp
@ -62,6 +62,8 @@ void adjustUtc(uavcan::UtcDuration adjustment)
 	(void)adjustment;
 }

+uavcan::uint64_t getUtcUSecFromCanInterrupt();
+
 uavcan::uint64_t getUtcUSecFromCanInterrupt()
 {
 	return 0;
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit c7872def16e82a8b318d571829fe9622e2d35ff0
+Subproject commit c4c14c60fbbd9acd281ee97d5bb2a4027d0ae2d9