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
@@ -44,3 +44,5 @@ SRCS = sensors.cpp \
MODULE_STACKSIZE = 1200
MAXOPTIMIZATION = -Os
EXTRACXXFLAGS = -Wno-type-limits