isvogor
|
788e9422b4
|
Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
script/testflockfev.bzz
src/roscontroller.cpp
|
2017-05-10 22:18:34 -04:00 |
|
David St-Onge
|
b871c2e25a
|
stig in flight bzz
|
2017-05-10 22:04:04 -04:00 |
|
Ivan Svogor
|
2b9c62df0e
|
update from solo - xbee fix
|
2017-05-11 01:57:41 +00:00 |
|
David St-Onge
|
cab2cc03a1
|
fixed local setpoint
|
2017-05-10 18:39:28 -04:00 |
|
dave
|
dbf0b6388c
|
fix launch files
|
2017-05-09 14:33:35 -04:00 |
|
dave
|
f8917cd39e
|
fix bzz compilation and moved scripts and include
|
2017-05-09 13:07:11 -04:00 |
|