diff options
| author | Goulwen Le Fur | 2014-08-04 14:29:54 +0000 |
|---|---|---|
| committer | Goulwen Le Fur | 2014-08-04 14:29:54 +0000 |
| commit | 4eabe34876ddcb67b510777db13cb3dc69531cb9 (patch) | |
| tree | b06b3fa7aa518e88e096d8dcc8c894f679be4361 /tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/RoomPropertiesEditionProvider.java | |
| parent | 784b0d109bc21c981a8bb88dd3a932d5c9da2e35 (diff) | |
| parent | 1d6bdb525e2b757fb876f0ddedb488eedd00f2de (diff) | |
| download | org.eclipse.eef-4eabe34876ddcb67b510777db13cb3dc69531cb9.tar.gz org.eclipse.eef-4eabe34876ddcb67b510777db13cb3dc69531cb9.tar.xz org.eclipse.eef-4eabe34876ddcb67b510777db13cb3dc69531cb9.zip | |
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
Diffstat (limited to 'tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/RoomPropertiesEditionProvider.java')
| -rw-r--r-- | tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/RoomPropertiesEditionProvider.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/RoomPropertiesEditionProvider.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/RoomPropertiesEditionProvider.java index 7fa59a62d..c9647f6c1 100644 --- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/RoomPropertiesEditionProvider.java +++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/RoomPropertiesEditionProvider.java @@ -134,7 +134,7 @@ public class RoomPropertiesEditionProvider extends PropertiesEditingProviderImpl * Provides the filter used by the plugin.xml to assign part forms. */ public static class EditionFilter implements IFilter { - + /** * {@inheritDoc} * |