SVN/GIT merge

Change-Id: I67870cc47b3858ba8d59b668a06becc86f54c1b9
Signed-off-by: wpiers <william.piers@obeo.fr>
78 files changed
tree: 20a2193b40f536cea90728b93121598c06425eb5
  1. .gitignore
  2. examples/
  3. features/
  4. plugins/
  5. tests/