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