Sync with trunk r63637.

svn path=/branches/shell-experiments/; revision=63640
This commit is contained in:
David Quintana 2014-06-23 23:28:38 +00:00
commit 73d72624b0
410 changed files with 4745 additions and 12328 deletions

View file

@ -1,6 +1,4 @@
if(NOT ARCH STREQUAL "amd64")
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/rostests/)
add_subdirectory(rostests)
endif()
@ -12,5 +10,3 @@ endif()
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/wallpaper/)
add_subdirectory(wallpaper)
endif()
endif()