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

This commit is contained in:
Lorenz Meier
2014-08-30 15:09:40 +02:00
2 changed files with 3 additions and 1 deletions
+2
View File
@@ -62,6 +62,8 @@ void adjustUtc(uavcan::UtcDuration adjustment)
(void)adjustment;
}
uavcan::uint64_t getUtcUSecFromCanInterrupt();
uavcan::uint64_t getUtcUSecFromCanInterrupt()
{
return 0;
+1 -1
Submodule uavcan updated: c7872def16...c4c14c60fb