Merge "Added hashcode/equals methods to generic profile Group implementations"

diff --git a/.gitignore b/.gitignore
index e3c807592e102eb7eeb1674a00c65a87e14d0762..cf73f85b69d9b4fbfe4e191227a7cb0a6fc594e3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@
 /tests/*/target/
 /**/.polyglot.build.properties
 org.eclipse.core.resources.prefs
-org.eclipse.m2e.core.prefs
\ No newline at end of file
+org.eclipse.m2e.core.prefs
+com.vaadin.designer.prefs
\ No newline at end of file

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagramEditor/dnd/messages.properties b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagramEditor/dnd/messages.properties
index b606334eb3a87288e6031724e5162aed0ada401c..2ede7138eaf80cc8b1485a3aadacb0b0ea265f89 100644 (file)
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagramEditor/dnd/messages.properties
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagramEditor/dnd/messages.properties
@@ -1,4 +1,4 @@
-DropSuggestions_ApplySuggestions_DialogMsg=In order to perform the requested drop operation, the changes listed below need to be performed.\\n\\nAre you sure you want to proceed?
+DropSuggestions_ApplySuggestions_DialogMsg=In order to perform the requested drop operation, the changes listed below need to be performed.\n\nAre you sure you want to proceed?
 DropSuggestions_ApplySuggestions_DialogTitle=Changes Required
-DropSuggestions_Description_LinkToLibrary=Link target model **{0}** \\u2192 library **{1}**
-DropSuggestions_Problem_CyclicDependency=Source namespace {0} is already linked to target namespace {1}. Creating a target \\u2192 source link would create a cyclic dependency.
+DropSuggestions_Description_LinkToLibrary=Link target model **{0}** \u2192 library **{1}**
+DropSuggestions_Problem_CyclicDependency=Source namespace {0} is already linked to target namespace {1}. Creating a target \u2192 source link would create a cyclic dependency.