Sync to trunk r65566.

svn path=/branches/condrv_restructure/; revision=65567
This commit is contained in:
Hermès Bélusca-Maïto
2014-12-05 21:20:35 +00:00
3454 changed files with 260105 additions and 130358 deletions
+3 -3
View File
@@ -1,12 +1,12 @@
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/rostests/)
add_subdirectory(rostests)
add_subdirectory(rostests)
endif()
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/rosapps/)
add_subdirectory(rosapps)
add_subdirectory(rosapps)
endif()
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/wallpaper/)
add_subdirectory(wallpaper)
add_subdirectory(wallpaper)
endif()