| commit | 4eabe34876ddcb67b510777db13cb3dc69531cb9 | [log] [tgz] |
|---|---|---|
| author | Goulwen Le Fur <goulwen.lefur@obeo.fr> | Mon Aug 04 16:29:54 2014 +0200 |
| committer | Goulwen Le Fur <goulwen.lefur@obeo.fr> | Mon Aug 04 16:29:54 2014 +0200 |
| tree | b06b3fa7aa518e88e096d8dcc8c894f679be4361 | |
| parent | 784b0d109bc21c981a8bb88dd3a932d5c9da2e35 [diff] | |
| parent | 1d6bdb525e2b757fb876f0ddedb488eedd00f2de [diff] |
Merge branch 'v1_4_0_BRANCH' Conflicts: plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/swtbot/SWTEEFBot.java plugins/org.eclipse.emf.eef.runtime.tests/META-INF/MANIFEST.MF releng/org.eclipse.emf.eef.releng.parent/pom.xml releng/org.eclipse.emf.eef.update/category.xml tests/org.eclipse.emf.eef.nonreg.design/bin/org/eclipse/emf/eef/nonreg/design/Activator.class