From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Mon, 21 Jan 2019 10:21:04 +0000 (+0000)
Subject: Merge "Added hashcode/equals methods to generic profile Group implementations"
X-Git-Tag: v1.43.0~136^2~206
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=857e30cfe60e890a21cdc1a63cdef5f681cb5a29;hp=cb337ac8c87b7bdad11ffb8584f76610c51d3a75

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

diff --git a/.gitignore b/.gitignore
index e3c807592..cf73f85b6 100644
--- 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 b606334eb..2ede7138e 100644
--- 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.