Commits · 0613df1a3f03c7e77ff6bc4276bacdcdf39f5c62 · lifo / Nicolas Ollinger / OpenBoard

04 Oct, 2012 7 commits
- Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop · 0613df1a
  Didier Bathily authored Oct 04, 2012
  
  0613df1a
- Missing files · 064e0b8d
  Didier Bathily authored Oct 04, 2012
```
Signed-off-by: Didier Bathily <didier.bathily@njin.fr>
```
  064e0b8d
- Merge branch 'develop' into shiba-dev · 22ec82a8
  shibakaneki authored Oct 04, 2012
  
  22ec82a8
- Fixed issue 1147 · 7eacdb62
  shibakaneki authored Oct 04, 2012
  
  7eacdb62
- fixed issue 1225 · 17c3184b
  Claudio Valerio authored Oct 04, 2012
  
  17c3184b
- Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into claudio-dev · 0c555c9c
  Claudio Valerio authored Oct 04, 2012
  
  0c555c9c
- fixed issue 1178 · 41d46485
  Claudio Valerio authored Oct 04, 2012
  
  41d46485
03 Oct, 2012 9 commits
- fixed 'Separe phrase' app · ba1a392c
  maximXbs authored Oct 03, 2012
  
  ba1a392c
- prefix pdf dpi issue · 31b1ba0a
  Didier Clerc authored Oct 03, 2012
  
  31b1ba0a
- Merge branch 'aleksei_kanash_dev' into develop · c55f5747
  Aleksei Kanash authored Oct 03, 2012
  
  c55f5747
- Fixed strokes duplication. · d6db8233
  Aleksei Kanash authored Oct 03, 2012
  
  d6db8233
- Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop · 3de730a7
  Aleksei Kanash authored Oct 03, 2012
  
  3de730a7
- <Auto Generated by Git> · f027788b
  Aleksei Kanash authored Oct 03, 2012
  
  f027788b
- Fixed items scaling. · 9888b99a
  Aleksei Kanash authored Oct 03, 2012
  
  9888b99a
- update version · 2466f5f8
  Claudio Valerio authored Oct 03, 2012
  
  2466f5f8
- Merge remote-tracking branch 'origin/develop' into claudio-dev · 8182c39b
  Claudio Valerio authored Oct 03, 2012
  
  8182c39b
02 Oct, 2012 22 commits
- Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop · 2698fca2
  bmagnin authored Oct 02, 2012
  
  2698fca2
- updated 'Contraste' app · 1e8c94be
  maximXbs authored Oct 02, 2012
  
  1e8c94be
- Wording in French interactivities · bfff57a3
  bmagnin authored Oct 02, 2012
  
  bfff57a3
- fixed issue 912 · a7e95315
  Claudio Valerio authored Oct 02, 2012
  
  a7e95315
- Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop · 94d91bb4
  bmagnin authored Oct 02, 2012
  
  94d91bb4
- Wording in french · 54349550
  bmagnin authored Oct 02, 2012
  
  54349550
- Merge branch 'develop' into Ilia_dev · 8045f15d
  Ilia Ryabokon authored Oct 02, 2012
  
  8045f15d
- Sankore 1189 - loading message · e36a58a2
  Ilia Ryabokon authored Oct 02, 2012
  
  e36a58a2
- Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop · a2b8d782
  Claudio Valerio authored Oct 02, 2012
  
  a2b8d782
- Merge remote-tracking branch 'origin/claudio-dev' into develop · c9fa3419
  Claudio Valerio authored Oct 02, 2012
  
  c9fa3419
- Merge remote-tracking branch 'origin/develop' into claudio-dev · 4ac3845d
  Claudio Valerio authored Oct 02, 2012
  
  4ac3845d
- fixed issue 1208 · 48714f86
  Claudio Valerio authored Oct 02, 2012
  
  48714f86
- Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop · 923f1a57
  Aleksei Kanash authored Oct 02, 2012
  
  923f1a57
- Fixed fall on assertion if svg writer. · cbe8469b
  Aleksei Kanash authored Oct 02, 2012
  
  cbe8469b
- Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop · e26bd33a
  bmagnin authored Oct 02, 2012
  
  e26bd33a
- Wording in interactivities · df59b2e9
  bmagnin authored Oct 02, 2012
  
  df59b2e9
- Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop · 9c5cbb58
  bmagnin authored Oct 02, 2012
```
Conflicts:
	resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js
	resources/library/interactivities/Ass sons.wgt/locales/fr/js/script.js
	resources/library/interactivities/Cat text.wgt/locales/fr/js/script.js
	resources/library/interactivities/Etudier.wgt/locales/fr/js/script.js
```
  9c5cbb58
- Fixed duplication of groups. · b9c26504
  Aleksei Kanash authored Oct 02, 2012
  
  b9c26504
- Fixed creation duplicated groups - used scene mechanism. · 0ed0540d
  Aleksei Kanash authored Oct 02, 2012
```
Excluded case of trying to determine mime type for empty string.
```
  0ed0540d
- Wording in help for interactivities · d0a24fd3
  bmagnin authored Oct 02, 2012
  
  d0a24fd3
- fixed issue 658 · ce0aebad
  Claudio Valerio authored Oct 02, 2012
  
  ce0aebad
- Fixed duplication of groups. · 8ee8b59b
  Aleksei Kanash authored Oct 02, 2012
  
  8ee8b59b
01 Oct, 2012 2 commits
- Merge remote-tracking branch 'origin/develop' into claudio-dev · 986e8e8f
  Claudio Valerio authored Oct 01, 2012
  
  986e8e8f
- fixed issue 1203 · e2e3dc0f
  Claudio Valerio authored Oct 01, 2012
  
  e2e3dc0f