Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Project_Phoenix
- Activity
- Members
- Labels
- Wiki
- Terraform modules

Snippets Groups Projects

84d7adb4

Commit 84d7adb4 authored 7 years ago by Jonathan Wendt

Downloads
- Plain Diff

Merge branch 'feature/#226_switch_to_bsd_3clause' into 'develop'

Feature/#226 switch to bsd 3clause

See merge request VR-Group/Project_Phoenix!63

parents ac304c8a e0ef626f

No related branches found

No related tags found

Loading

Changes 132

Show whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 8 additions, 7 deletions

CMakeLists.txt
LICENSE 2 additions, 2 deletions

LICENSE
README.md 3 additions, 2 deletions

README.md
cmake/ConanHelpers.cmake 6 additions, 6 deletions

cmake/ConanHelpers.cmake
cmake/ConfigureFiles.cmake 8 additions, 7 deletions

cmake/ConfigureFiles.cmake
cmake/FindSDL2.cmake 1 addition, 1 deletion

cmake/FindSDL2.cmake
cmake/Testing.cmake 8 additions, 7 deletions

cmake/Testing.cmake
cmake/WarningLevels.cmake 8 additions, 7 deletions

cmake/WarningLevels.cmake
cmake/conan.cmake 1 addition, 1 deletion

cmake/conan.cmake
cmake/cppcheck.cmake 8 additions, 7 deletions

cmake/cppcheck.cmake
cmake/cpplint.cmake 8 additions, 7 deletions

cmake/cpplint.cmake
cmake/phoenix-config.cmake.in 1 addition, 1 deletion

cmake/phoenix-config.cmake.in
cmake/resources_path.hpp.in 1 addition, 1 deletion

cmake/resources_path.hpp.in
cmake/suppress_warnings.hpp.in 1 addition, 1 deletion

cmake/suppress_warnings.hpp.in
conanfile.py 8 additions, 7 deletions

conanfile.py
demos/CMakeLists.txt 8 additions, 7 deletions

demos/CMakeLists.txt
demos/viewer/CMakeLists.txt 9 additions, 8 deletions

demos/viewer/CMakeLists.txt
demos/viewer/src/rotation_behavior.cpp 4 additions, 3 deletions

demos/viewer/src/rotation_behavior.cpp
demos/viewer/src/rotation_behavior.hpp 4 additions, 3 deletions

demos/viewer/src/rotation_behavior.hpp
demos/viewer/src/viewer.cpp 4 additions, 3 deletions

demos/viewer/src/viewer.cpp

with 101 additions and 88 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment