Commits · 43a5b4c8593358632d99bfe69888ebcd93b8517c · Thomas Pitiot / CGoGN

20 Feb, 2015 1 commit
- some cleaning + ihm3 modifications · 43a5b4c8
  Lionel Untereiner authored Feb 20, 2015
  
  43a5b4c8
19 Feb, 2015 4 commits
- adding debug · 79edfd10
  pitiot authored Feb 19, 2015
  
  79edfd10
- adding debug · 22edb204
  pitiot authored Feb 19, 2015
  
  22edb204
- up parts · 938bb878
  pitiot authored Feb 19, 2015
  
  938bb878
- some changes · 8367821e
  Lionel Untereiner authored Feb 19, 2015
  
  8367821e
17 Feb, 2015 1 commit
- adding part cell · a31bc901
  pitiot authored Feb 17, 2015
  
  a31bc901
11 Feb, 2015 1 commit
- up · d69b68dc
  pitiot authored Feb 11, 2015
  
  d69b68dc
02 Feb, 2015 3 commits
- merge untereiner · 68c88362
  pitiot authored Feb 02, 2015
  
  68c88362
- merge cgogn central · a9a12bbf
  pitiot authored Feb 02, 2015
  
  a9a12bbf
- Merge branch 'master' into 'master' · 7114af20
  Sylvain Thery authored Feb 02, 2015
```
Master

once upon a time

See merge request !39
```
  7114af20
27 Jan, 2015 3 commits
- Merge branch 'develop' into 'master' · 21e86c78
  Lionel Untereiner authored Jan 27, 2015
```
Develop

See merge request !1
```
  21e86c78
- old fashioned IHM3 are back · a0a2dc32
  Lionel Untereiner authored Jan 27, 2015
  
  a0a2dc32
- change · b6dd249d
  pitiot authored Jan 27, 2015
  
  b6dd249d
26 Jan, 2015 9 commits
- bug missing pfp:: · 7576a3e9
  Sylvain Thery authored Jan 26, 2015
  
  7576a3e9
- Merge icube-forge.unistra.fr:cgogn/cgogn · 8d771e17
  Sylvain Thery authored Jan 26, 2015
  
  8d771e17
- Merge branch 'develop' into 'master' · e50b4eb7
  Pierre Kraemer authored Jan 26, 2015
```
Develop

new SCHNApps plugin : surface_distance

See merge request !31
```
  e50b4eb7
- SCHNApps: create surface_distance plugin · a0619054
  Pierre Kraemer authored Jan 26, 2015
  
  a0619054
- Merge branch 'develop' into 'master' · 95e60c11
  Pierre Kraemer authored Jan 26, 2015
```
Develop

corrections dans les collector : parametres template inutiles et types Vertex/Edge/Face au lieu de Dart

See merge request !30
```
  95e60c11
- Merge remote-tracking branch 'CGoGNcentral/develop' into develop · eff3eec9
  Sauvage authored Jan 26, 2015
```
Conflicts:
	include/Algo/Selection/collector.hpp
```
  eff3eec9
- Merge remote-tracking branch 'cgogn/develop' into develop · 74ca83b1
  Pierre Kraemer authored Jan 26, 2015
  
  74ca83b1
- Merge branch 'develop' into 'develop' · 679b508c
  Sylvain Thery authored Jan 26, 2015
```
Develop

See merge request !29
```
  679b508c
- remove cmake policy error with 2.8 · 9e1bec20
  Sylvain Thery authored Jan 26, 2015
  
  9e1bec20
23 Jan, 2015 3 commits
- Merge remote-tracking branch 'cgogn/develop' into develop · 82c83351
  Pierre Kraemer authored Jan 23, 2015
  
  82c83351
- Merge branch 'develop' into 'develop' · 760088df
  Sylvain Thery authored Jan 23, 2015
```
Develop

See merge request !28
```
  760088df
- OpenNL dylib compiling bug · a6a88919
  Sylvain Thery authored Jan 23, 2015
  
  a6a88919
22 Jan, 2015 1 commit
- Merge branch 'develop' of icube-forge.unistra.fr:cgogn/cgogn into develop · 652fa86d
  Lionel Untereiner authored Jan 22, 2015
  
  652fa86d
19 Jan, 2015 1 commit
- tinyxml2 copy in third_party · 39827e0e
  Sylvain Thery authored Jan 19, 2015
  
  39827e0e
14 Jan, 2015 1 commit
- bug install tinyXml2, I hope the last · 69b46a46
  Sylvain Thery authored Jan 14, 2015
  
  69b46a46
13 Jan, 2015 2 commits
- Merge branch 'develop' of icube-forge.unistra.fr:kraemer/cgogn into develop · 8c8c80df
  Pierre Kraemer authored Jan 13, 2015
  
  8c8c80df
- tinyxml2 install bug · 637f841d
  Sylvain Thery authored Jan 13, 2015
  
  637f841d
12 Jan, 2015 6 commits
- Merge remote-tracking branch 'cgogn/develop' into develop · beca7656
  Pierre Kraemer authored Jan 12, 2015
  
  beca7656
- Merge branch 'develop' into 'develop' · 6471d0c6
  Sylvain Thery authored Jan 12, 2015
```
Develop

See merge request !27
```
  6471d0c6
- bug install tinyXml2 · 57766e9f
  Sylvain Thery authored Jan 12, 2015
  
  57766e9f
- Merge remote-tracking branch 'cgogn/develop' into develop · 45b4acdc
  Pierre Kraemer authored Jan 12, 2015
  
  45b4acdc
- Merge branch 'develop' into 'develop' · aac63fd5
  Sylvain Thery authored Jan 12, 2015
```
Develop

See merge request !26
```
  aac63fd5
- TinyXml2 with superbuild git add CMakeLists.txt SCHNApps/CMakeLists.txt ThirdParty/CMakeLists.txt · f0d34ac4
  Sylvain Thery authored Jan 12, 2015
  
  f0d34ac4
06 Jan, 2015 1 commit
- Merge remote-tracking branch 'cgogn/develop' into develop · d6c0e496
  Pierre Kraemer authored Jan 06, 2015
  
  d6c0e496
22 Dec, 2014 3 commits
- Merge icube-forge.unistra.fr:cgogn/cgogn · b9808b7c
  Sylvain Thery authored Dec 22, 2014
  
  b9808b7c
- Merge branch 'develop' into 'master' · 5fc601bd
  Sylvain Thery authored Dec 22, 2014
```
Christmas merge ..

See merge request !25
```
  5fc601bd
- Merge branch 'develop' into 'develop' · ffaa09d7
  Sylvain Thery authored Dec 22, 2014
```
Christmas merge

See merge request !24
```
  ffaa09d7