Merge remote-tracking branch 'upstream/master'

Browse Source

Conflicts:
	libuavcan/include/uavcan/build_config.hpp

...

This commit is contained in:

ilia-sheremet

2015-06-26 14:39:29 +02:00

parent 573b268457 1b698c4267

commit 0af89b8d15

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available