Fixes to improve platform support
- detect XCode in CMake and handle equivalent to Unix environment
- fix problem with glew 1.13 and GL core cotext
- bugfix for potential hangup during app init
Step 1. Fetch and check out the branch for this merge request
git fetch https://gitlab.lrz.de/weiss/campvis-nx.git cppcourse-ws17 git checkout -b weiss/campvis-nx-cppcourse-ws17 FETCH_HEAD
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git fetch origin git checkout origin/cppcourse-ws17 git merge --no-ff weiss/campvis-nx-cppcourse-ws17
Step 4. Push the result of the merge to GitLab
git push origin cppcourse-ws17
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines.
This will create a new commit in order to revert the existing changes.