merged master to 0.11.0

This commit is contained in:
matlabbe
2015-12-02 11:55:46 -05:00
5 changed files with 61 additions and 8 deletions

View File

@@ -162,8 +162,6 @@ IF(G2O_FOUND)
${LIBRARIES}
${G2O_LIBRARIES}
)
#Newest versions require std11
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
SET(SRC_FILES
${SRC_FILES}