Commit Graph

13 Commits

Author SHA1 Message Date
Thomas Gubler f4e0dc2857 Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
	.gitmodules
2014-12-29 08:00:12 +01:00
Thomas Gubler 382158d87b fix merge error in .gitmodules 2014-12-25 10:03:46 +01:00
Thomas Gubler 25af4b266c Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
	.gitignore
	src/lib/uavcan
2014-12-25 09:48:15 +01:00
Simon Wilks 2f332f0e92 Integrate the Google Test framework. 2014-12-25 08:10:21 +01:00
Lorenz Meier 84d744707d UAVCAN: Move into lib directory 2014-12-23 14:34:53 +01:00
Thomas Gubler 6f9cbd9751 add genmsg and gencpp python modules, ros not required anymore for message generation 2014-12-04 16:40:46 +01:00
Pavel Kirienko 6814ddccff UAVCAN as a submodule 2014-07-08 20:19:17 +04:00
Lorenz Meier 3251100947 Added NuttX 2014-07-07 17:21:20 +02:00
Lorenz Meier 9886bb8ca0 Fixed .gitmodules 2014-07-07 17:20:32 +02:00
Lorenz Meier 4c2cc65ca6 Cleaning up sub modules 2014-07-07 17:18:54 +02:00
Lorenz Meier b74d4e2ba7 Added NuttX submodule 2014-07-07 16:59:44 +02:00
Thomas Gubler e103f5f8cb change mavlink submodule url 2014-07-07 14:59:57 +02:00
Thomas Gubler a366f76efa mavlink as git submodule
Mavlink is now a git submodule because auto generated header files are
available at https://github.com/mavlink/c_library
2014-07-02 14:18:55 +02:00