Merge branch 'master' into api_embellishment
tree18e621bc6974a78beac007a0ae4380c24aea08c6
-rw-r--r-- 27 .gitignore
drwxr-xr-x - org.eclipse.emf.compare-parent
drwxr-xr-x - packaging
drwxr-xr-x - plugins