Merge commit '25b6c25959c1fb3c60bb41cd0e1f0808e7fc3769'

diff --combined bundles/org.simantics.utils.datastructures/build.properties
index 12cb67a4b5e6668a45bbf3c3437398f614478077,accbb69ba407abbf8699726a1c9749e5451406b3..05d60ae9b66d7635346e187c9b81cf3276d01a23
--- 1/bundles/org.simantics.utils.datastructures/build.properties
--- 2/bundles/org.simantics.utils.datastructures/build.properties
+++ b/bundles/org.simantics.utils.datastructures/build.properties
@@@ -12,5 -12,4 +12,4 @@@
  source.. = src/\r
  output.. = bin/\r
  bin.includes = META-INF/,\\r
-                .\r
- \r
 -               .
++               .