Merge pull request #66 from tshoang/master

Fixed Issue #65: Markers attach to an XMachine or an XContext

ac.soton.xeventb.feature/feature.properties

@@ -35,10 +35,15 @@ Release history:\n\
 ---------------\n\
 ### 2.1.0 Usability Update  ###\n\
 #### Updated Plug-ins/Features ####\n\
+- XContext (2.1.0): Attach the markers to the XContext's name if no child \
+element found (see Issue #65).\n\
+- XMachine (2.1.0): Attach the markers to the XMachine's name if no child \
+element found (see Issue #65).\n\
 - CamilleX UI (1.1.0): Added a context menu item to do the batch generation of \
-CamilleX source files.\n\
+CamilleX source files (see Issue #63).\n\
 #### Fixed Issues ####\n\
 - Issue #63: Batch generation for a collection of CamilleX source files.\n\
+- Issue #65: Markers attach to an XMachine or an XContext.\n\
 ### 2.0.2 Maintenance release ###\n\
 - Fixed the Update Site name.\n\
 - Removed the included features: Inclusion, Records, Containment\n\

ac.soton.xeventb.sdk/feature.properties

@@ -35,6 +35,8 @@ Release history:\n\
 ### 2.1.0 Usability Update ###\n\
 #### Updated Plug-ins/Features ####\n\
 - CamilleX Feature (2.1.0)\n\
+- XContext Source (2.1.0): Generated\n\
+- XMachine Source (2.1.0): Generated\n\
 - CamilleX UI Source (1.1.0): Generated \n\
 ### 2.0.2 Maintenance release ###\n\
 - Fixed Update Site name.\n\

ac.soton.xeventb.xcontext/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 2.0.2.release
+Bundle-Version: 2.1.0.qualifier
 Bundle-SymbolicName: ac.soton.xeventb.xcontext;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eventb.emf.core;bundle-version="[5.0.0,6.0.0)",