Merged master from main repo

This commit is contained in:
Lorenz Meier 2013-05-22 12:25:13 +02:00
parent 03eac33a3d
commit cb1fbecd09

View File

@ -74,15 +74,19 @@ MODULES += modules/multirotor_pos_control
MODULES += modules/sdlog
#
# Libraries
# Library modules
#
MODULES += modules/systemlib
MODULES += modules/systemlib/mixer
MODULES += modules/mathlib
MODULES += modules/mathlib/CMSIS
MODULES += modules/controllib
MODULES += modules/uORB
#
# Libraries
#
LIBRARIES += modules/mathlib/CMSIS
#
# Demo apps
#