Merge branch 'cmake-2' of github.com:jgoppert/Firmware into cmake-2

Conflicts:
	CMakeLists.txt
This commit is contained in:
James Goppert
2015-09-10 23:44:39 -04:00
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
include(posix/px4_impl_posix-arm)
include(posix/px4_impl_posix)
set(USE_TOOLCHAIN Toolchain-arm-linux-gnueabihf)
+1 -1
View File
@@ -1,4 +1,4 @@
include(posix/px4_impl_posix-arm)
include(posix/px4_impl_posix)
set(USE_TOOLCHAIN Toolchain-arm-linux-gnueabihf)
+1 -1
View File
@@ -1,4 +1,4 @@
include(posix/px4_impl_posix-arm)
include(posix/px4_impl_posix)
set(USE_TOOLCHAIN Toolchain-arm-linux-gnueabihf)