Merge remote-tracking branch 'upstream/master' into dev_ros

Conflicts:
	.gitmodules
This commit is contained in:
Thomas Gubler
2014-12-29 08:00:12 +01:00
82 changed files with 651 additions and 87 deletions
+2
View File
@@ -58,3 +58,5 @@ SRCS = err.c \
mcu_version.c
MAXOPTIMIZATION = -Os
EXTRACFLAGS = -Wno-sign-compare