Commits · 4d4b37d5978101e53657badcef083ff29e60dca8 · Stephane Crozat / hdoc · GitLab

07 Jan, 2016 40 commits
- Updated READ ME · 4d4b37d5
  Harriga Merouane authored Jan 07, 2016
  
  4d4b37d5
- Merge branch 'master' of gitlab.utc.fr:crozatst/hdoc · 297380da
  Jean Vintache authored Jan 07, 2016
  
  297380da
- fix *.scar to result.scar in ant · 57713d35
  Jean Vintache authored Jan 07, 2016
  
  57713d35
- Merge branch 'master' of gitlab.utc.fr:crozatst/hdoc · 80d4ba6a
  aperdria authored Jan 07, 2016
```
Conflicts:
	mindmapping_to_hdoc/README.md
```
  80d4ba6a
- Deletion of a part of the README · b12a6038
  aperdria authored Jan 07, 2016
  
  b12a6038
- debug windows .bat · 0657d1f1
  Zangdar1111 authored Jan 07, 2016
  
  0657d1f1
- Update Readme.md · 43fc7c71
  Harold Carrel Billiard authored Jan 07, 2016
  
  43fc7c71
- Updated READ ME · 0eb9675c
  Harriga Merouane authored Jan 07, 2016
  
  0eb9675c
- Modification of the README · 3e43cd44
  aperdria authored Jan 07, 2016
  
  3e43cd44
- Merge branch 'master' of https://gitlab.utc.fr/crozatst/hdoc · 61ed8f1d
  jcomedouteau authored Jan 07, 2016
  
  61ed8f1d
- Change readme etherpad to hdoc · 15575b02
  jcomedouteau authored Jan 07, 2016
  
  15575b02
- fix readme confict after merge · 31ee91ec
  jcomedouteau authored Jan 07, 2016
  
  31ee91ec
- Update ReadMe.md · 9a264cbb
  Nicolas Lhomme authored Jan 07, 2016
  
  9a264cbb
- update README file · 0cd7d8da
  Jean-Baptiste Martin authored Jan 07, 2016
  
  0cd7d8da
- update readme · c48dac70
  Harold Carrel Billiard authored Jan 07, 2016
  
  c48dac70
- Update ReadMe · 65e931f1
  Nicolas Lhomme authored Jan 07, 2016
  
  65e931f1
- [Opale2Optim] Reset the sample.scar DO NOT DELETE IT PLEASE. · a4f47d6b
  Drain authored Jan 07, 2016
  
  a4f47d6b
- Update Readme · 9d0a9a13
  Nicolas Lhomme authored Jan 07, 2016
  
  9d0a9a13
- [Mindmapping] Fix run.sh for some linux users · 794b3f78
  Bastien FREMONDIERE authored Jan 07, 2016
  
  794b3f78
- Delete mindmapping_to_lexique and mindmapping_to_optim ; · bd599531
  aperdria authored Jan 07, 2016
  
  bd599531
- Merge branch 'master' of gitlab.utc.fr:crozatst/hdoc · dc323bcf
  Ivan D'halluin authored Jan 07, 2016
  
  dc323bcf
- add todos · 00cb56af
  Ivan D'halluin authored Jan 07, 2016
  
  00cb56af
- fix etherpad_to_opale · 8b33cd98
  Jean Vintache authored Jan 07, 2016
  
  8b33cd98
- fix run.sh not existing · 0be1536d
  Jean Vintache authored Jan 07, 2016
  
  0be1536d
- Merge branch 'master' of gitlab.utc.fr:crozatst/hdoc · 6bc1b72e
  Jean Vintache authored Jan 07, 2016
  
  6bc1b72e
- fix etherpad to lexique · 010fdf80
  Jean Vintache authored Jan 07, 2016
  
  010fdf80
- [Opale2Optim] Modified the README · 96472729
  Drain authored Jan 07, 2016
  
  96472729
- Merge branch 'master' of gitlab.utc.fr:crozatst/hdoc · 750a0381
  Jean Vintache authored Jan 07, 2016
  
  750a0381
- fix etherpad to lexique · 2c928108
  Jean Vintache authored Jan 07, 2016
  
  2c928108
- Merge branch 'master' of https://gitlab.utc.fr/crozatst/hdoc · 82249f20
  Antoine authored Jan 07, 2016
  
  82249f20
- Merge branch 'master' of https://gitlab.utc.fr/crozatst/hdoc · 634d15af
  Antoine authored Jan 07, 2016
  
  634d15af
- Merge branch 'master' of gitlab.utc.fr:crozatst/hdoc · ecbf1124
  Ivan D'halluin authored Jan 07, 2016
  
  ecbf1124
- Merge branch 'master' of gitlab.utc.fr:crozatst/hdoc · e3e90fa6
  Ivan D'halluin authored Jan 07, 2016
  
  e3e90fa6
- Merge branch 'master' of gitlab.utc.fr:crozatst/hdoc · 694f65ed
  Jean-Baptiste Martin authored Jan 07, 2016
  
  694f65ed
- add opale version to todo · 2471246c
  Ivan D'halluin authored Jan 07, 2016
  
  2471246c
- Merge branch 'master' of https://gitlab.utc.fr/crozatst/hdoc · 321c1701
  Antoine authored Jan 07, 2016
```
Conflicts:
	lexique_to_hdoc/README.md
```
  321c1701
- Merge branch 'master' of gitlab.utc.fr:crozatst/hdoc · 5e47cc12
  Jean-Baptiste Martin authored Jan 07, 2016
  
  5e47cc12
- Merge branch 'master' of gitlab.utc.fr:crozatst/hdoc · 157648a5
  Decorde Jeffrey authored Jan 07, 2016
  
  157648a5
- fix etherpad-to-optim (output.hdoc -> pad.hdoc) · cf4defe1
  Jean Vintache authored Jan 07, 2016
  
  cf4defe1
- Merge branch 'master' of gitlab.utc.fr:crozatst/hdoc · 262bbcaa
  Jean-Baptiste Martin authored Jan 07, 2016
  
  262bbcaa