Merge branch 'master' of https://github.com/siana/SingularityViewer

Resolved Conflicts:
	indra/llcommon/aithreadsafe.h

Manually added patch had trailing space more.

indra/cmake/00-Common.cmake

@@ -164,6 +164,11 @@ if (LINUX)
     add_definitions(-Wno-parentheses)
   endif (${CXX_VERSION} GREATER 429)
 
+  #gcc 4.6 has a new spammy warning
+  if(NOT ${CXX_VERSION} LESS 460)
+    add_definitions(-Wno-unused-but-set-variable)
+  endif (NOT ${CXX_VERSION} LESS 460)
+
   # End of hacks.
 
   add_definitions(

indra/cmake/GooglePerfTools.cmake

@@ -21,7 +21,6 @@ else (STANDALONE)
     endif()
     set(GOOGLE_PERFTOOLS_INCLUDE_DIR
         ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
-    set(GOOGLE_PERFTOOLS_FOUND "YES")
   endif (LINUX)
 endif (STANDALONE)