Merged /sysdyn/trunk:r33171-r33408 to /sysdyn/branches/git.

refs #6860

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/branches/git@33409 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --cc org.simantics.sysdyn.internal.feature/feature.xml
index e8d6429e7a22203d0f7f6a7d2d1b5b4cac291a5b,57f50f9f2a0b4a6ddd27fd8a57ef1ee36a20e05e..60192611c6ff5699d0a0b732011b066cd8c5106b
--- 1/org.simantics.sysdyn.internal.feature/feature.xml
--- 2/org.simantics.sysdyn.internal.feature/feature.xml
+++ b/org.simantics.sysdyn.internal.feature/feature.xml
@@@ -10,11 -10,11 +10,11 @@@
     </description>\r
  \r
     <copyright>\r
--      Copyright (c) 2007, 2016 Association for Decentralized Information
--Management in Industry THTH ry.&lt;br/&gt;
--All rights reserved. This program and the accompanying materials
--are made available under the terms of the Eclipse Public License
--v1.0 which accompanies this distribution, and is available at
++      Copyright (c) 2007, 2016 Association for Decentralized Information\r
++Management in Industry THTH ry.&lt;br/&gt;\r
++All rights reserved. This program and the accompanying materials\r
++are made available under the terms of the Eclipse Public License\r
++v1.0 which accompanies this distribution, and is available at\r
  &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;\r
     </copyright>\r
  \r

diff --cc org.simantics.sysdyn.project-set/sysdyn.psf
Simple merge