* Sync up to trunk head (r60691).

svn path=/branches/ntvdm/; revision=60692
This commit is contained in:
Amine Khaldi
2013-10-17 11:19:05 +00:00
5851 changed files with 218087 additions and 724119 deletions
+4
View File
@@ -1,4 +1,6 @@
if(NOT ARCH STREQUAL "amd64")
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/rostests/)
add_subdirectory(rostests)
endif()
@@ -10,3 +12,5 @@ endif()
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/wallpaper/)
add_subdirectory(wallpaper)
endif()
endif()