Resolve conflicts taking new release changes
No related branches found
No related tags found
Showing
- .gitignore 8 additions, 10 deletions.gitignore
- .travis.yml 56 additions, 0 deletions.travis.yml
- CMakeHeaderFileList.cmake 0 additions, 407 deletionsCMakeHeaderFileList.cmake
- CMakeLists.txt 722 additions, 2359 deletionsCMakeLists.txt
- CMakeModules/FindLAPACK_C.cmake 0 additions, 165 deletionsCMakeModules/FindLAPACK_C.cmake
- CMakeModules/OgreTools.cmake 0 additions, 174 deletionsCMakeModules/OgreTools.cmake
- CMakeModules/VISPDetectPlatform.cmake 0 additions, 41 deletionsCMakeModules/VISPDetectPlatform.cmake
- CMakeSourceFileList.cmake 0 additions, 489 deletionsCMakeSourceFileList.cmake
- CTestConfig.cmake 120 additions, 118 deletionsCTestConfig.cmake
- ChangeLog 71 additions, 0 deletionsChangeLog
- INSTALL.txt 6 additions, 15 deletionsINSTALL.txt
- README.md 15 additions, 0 deletionsREADME.md
- README.txt 0 additions, 274 deletionsREADME.txt
- cmake/AddExtraCompilationFlags.cmake 201 additions, 166 deletionscmake/AddExtraCompilationFlags.cmake
- cmake/CPackConfig.cmake 11 additions, 14 deletionscmake/CPackConfig.cmake
- cmake/CPackConfigDeb.cmake 8 additions, 11 deletionscmake/CPackConfigDeb.cmake
- cmake/CPackConfigNsis.cmake 8 additions, 11 deletionscmake/CPackConfigNsis.cmake
- cmake/CPackConfigRpm.cmake 8 additions, 11 deletionscmake/CPackConfigRpm.cmake
- cmake/FindARIA.cmake 49 additions, 50 deletionscmake/FindARIA.cmake
- cmake/FindBICLOPS.cmake 8 additions, 11 deletionscmake/FindBICLOPS.cmake
Loading
Please register or sign in to comment