Commits · ae565a4bf1bfc830517f0582e4d35f9c9ea35839 · OpenFlipper-Free / OpenFlipper-Free

19 May, 2016 1 commit
- * added recursive folder macro to group files in folders on MSVC · ae565a4b
  Martin Schultz authored May 19, 2016
```
* added grouping to ACG
```
  ae565a4b
18 May, 2016 6 commits
- Merge branch 'fix_define' into 'master' · fa554a0e
  Jan Möbius authored May 18, 2016
```
Fixed glew and renderobject define collision



See merge request !102
```
  fa554a0e
- Fixed glew and renderobject define collision · 4327f6d4
  Jan Möbius authored May 18, 2016
  
  4327f6d4
- Merge branch 'glew_1.13' into 'master' · eca9790c
  Jan Möbius authored May 18, 2016
```
Added glew 1.13 to finder



See merge request !100
```
  eca9790c
- Merge branch 'Updated_holefiller_signature' into 'master' · 98c3b2a0
  Jan Möbius authored May 18, 2016
```
Updated slotObjectUpdated Signature



See merge request !101
```
  98c3b2a0
- Added glew 1.13 to finder · 01883ebb
  Jan Möbius authored May 18, 2016
  
  01883ebb
- Updated slotObjectUpdated Signature · 5536c8f8
  Jan Möbius authored May 18, 2016
  
  5536c8f8
13 May, 2016 3 commits
- Reverted revert. Argh · 9ec6e923
  Jan authored May 13, 2016
  
  9ec6e923
- Merge branch 'featureQt5.6Support' · e31afaa6
  Jan authored May 13, 2016
```
Conflicts:
	cmake/ACGCommon.cmake
```
  e31afaa6
- fixed bug in cmake that prevented proper detection of qt < 5.6 · 69631474
  Martin Schultz authored May 13, 2016
  
  69631474
12 May, 2016 6 commits
- Merge branch 'revert-d3af04a7' into 'master' · 16ff6ea7
  Jan Möbius authored May 12, 2016
```
Revert "Merge branch 'featureQt5.6Support' into 'master'"

This reverts merge request !92

See merge request !98
```
  16ff6ea7
- Revert "Merge branch 'featureQt5.6Support' into 'master'" · 5259f895
  Jan Möbius authored May 12, 2016
```
This reverts merge request !92
```
  5259f895
- Merge branch 'featureQt5.6Support' into 'master' · d3af04a7
  Jan Möbius authored May 12, 2016
```
Feature qt5.6 support



See merge request !92
```
  d3af04a7
- Merge branch 'master' into featureQt5.6Support · da097bd9
  Martin Schultz authored May 12, 2016
  
  da097bd9
- Merge branch 'featureQt5.6Support' of... · 28b0bba6
  Martin Schultz authored May 12, 2016
```
Merge branch 'featureQt5.6Support' of https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/OpenFlipper-Free into featureQt5.6Support
```
  28b0bba6
- added glew back to the build documentation · fd22e045
  Martin Schultz authored May 12, 2016
  
  fd22e045
11 May, 2016 12 commits
- Merge branch 'Artifacts_cppcheck' into 'master' · d739ac88
  Jan Möbius authored May 11, 2016
```
Artifacts cppcheck



See merge request !94
```
  d739ac88
- Merge branch 'Fixed_bad_signature' into 'master' · a4813e36
  Jan Möbius authored May 11, 2016
```
Fixed bad signature for updated object



See merge request !95
```
  a4813e36
- Merge branch 'cppcheck_via_gitlab' into 'master' · fbe17eac
  Jan Möbius authored May 11, 2016
```
Cppcheck via gitlab

Run cppcheck via gitlab not via jenkins

See merge request !93
```
  fbe17eac
- Updated to OpenMesh head · 0d88413e
  Jan Möbius authored May 11, 2016
  
  0d88413e
- Updated OpenMesh to head · dfe44f8f
  Jan Möbius authored May 11, 2016
  
  dfe44f8f
- Fixed bad signature for updated object · c6974d76
  Jan Möbius authored May 11, 2016
  
  c6974d76
- Store cppcheck output as artifact. · b703bdef
  Jan Möbius authored May 11, 2016
  
  b703bdef
- Set maximal allowed cpp error count to 54 · 851abb59
  Jan Möbius authored May 11, 2016
  
  851abb59
- Updated ci cppcheck script · 55901db2
  Jan Möbius authored May 11, 2016
  
  55901db2
- cppcheck fixes · d3d58f26
  Jan Möbius authored May 11, 2016
  
  d3d58f26
- Fixed some cppcheck warnings · bc8be1bc
  Jan Möbius authored May 11, 2016
  
  bc8be1bc
- Fixed some cppcheck warnings · 881e2726
  Jan Möbius authored May 11, 2016
  
  881e2726
10 May, 2016 12 commits
- cppcheck fix · bb5e2393
  Jan Möbius authored May 10, 2016
  
  bb5e2393
- Run OpenFlipper cppcheck via gitlab · ced979c5
  Jan Möbius authored May 10, 2016
  
  ced979c5
- * minor adjustment to the qt5 finder · 7164801e
  Martin Schultz authored May 10, 2016
  
  7164801e
- Updated OpenMesh to head · 8f913ee4
  Jan Möbius authored May 10, 2016
  
  8f913ee4
- Merge branch 'Fix_CLP_Finder' into 'master' · 01267f24
  Jan Möbius authored May 10, 2016
```
Fixed mismatching ifs in cmake files



See merge request !90
```
  01267f24
- Merge branch 'Update_protected' into 'master' · 258cebcf
  Jan Möbius authored May 10, 2016
```
Made the update function protected instead of private. Forgot the hierarchy



See merge request !91
```
  258cebcf
- Fixed mismatching ifs in cmake files · aa43d680
  Jan Möbius authored May 10, 2016
  
  aa43d680
- Made the update function protected instead of private. Forgot the hierarchy · 35717d48
  Jan Möbius authored May 10, 2016
  
  35717d48
- * added QT version variables which where missing on non windows platforms. · b4943ef6
  Martin Schultz authored May 10, 2016
  
  b4943ef6
- * added switch for qt5.6 finders in cmake file · a7d45892
  Martin Schultz authored May 10, 2016
  
  a7d45892
- Revert "Merge branch 'newGLLoader' into 'master' · 088454ed
  Martin Schultz authored May 10, 2016
```
As the new glLoad is not compatible with Qt 5.6 we will continue using
glew for now.

This reverts commit 22938119, reversing
changes made to ed8a9a65.
```
  088454ed
- Merge branch 'ACG_DEFAULTS' into 'master' · 02a94b65
  Jan Möbius authored May 10, 2016
```
Updated acg defaults



See merge request !89
```
  02a94b65