]> gerrit.simantics Code Review - simantics/3d.git/log
simantics/3d.git
8 years agoMerged trunk@31312 to branches/simantics-1.18 on 2015-05-18 for 1.18.1 release. simantics-1.18.1
lehtonen [Mon, 18 May 2015 20:35:05 +0000 (20:35 +0000)]
Merged trunk@31312 to branches/simantics-1.18 on 2015-05-18 for 1.18.1 release.

refs #5854

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31314 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoMerged trunk@31302,31304 to branches/simantics-1.18 on 2015-05-18 for 1.18.1 release.
lehtonen [Mon, 18 May 2015 08:52:59 +0000 (08:52 +0000)]
Merged trunk@31302,31304 to branches/simantics-1.18 on 2015-05-18 for 1.18.1 release.

refs #5851

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31305 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoMerged trunk@31298 to branches/simantics-1.18 on 2015-05-15 for 1.18.2 release.
lehtonen [Fri, 15 May 2015 12:33:24 +0000 (12:33 +0000)]
Merged trunk@31298 to branches/simantics-1.18 on 2015-05-15 for 1.18.2 release.

refs #5823

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31299 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoMerged trunk@31295 to branches/simantics-1.18 on 2015-05-15 for 1.18.2 release.
lehtonen [Fri, 15 May 2015 12:16:01 +0000 (12:16 +0000)]
Merged trunk@31295 to branches/simantics-1.18 on 2015-05-15 for 1.18.2 release.

refs #5850

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31296 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoMerged trunk@31250 to branches/simantics-1.18 on 2015-05-15 for 1.18.1 release.
lehtonen [Fri, 15 May 2015 10:42:51 +0000 (10:42 +0000)]
Merged trunk@31250 to branches/simantics-1.18 on 2015-05-15 for 1.18.1 release.

refs #5827

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31293 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoMerged trunk@31237,31284 to branches/simantics-1.18 on 2015-05-15 for 1.18.1 release.
lehtonen [Fri, 15 May 2015 10:41:45 +0000 (10:41 +0000)]
Merged trunk@31237,31284 to branches/simantics-1.18 on 2015-05-15 for 1.18.1 release.

refs #5823

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31292 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoMerged trunk@31211,31235 to branches/simantics-1.18 on 2015-05-15 for 1.18.1 release.
lehtonen [Fri, 15 May 2015 10:40:20 +0000 (10:40 +0000)]
Merged trunk@31211,31235 to branches/simantics-1.18 on 2015-05-15 for 1.18.1 release.

refs #5801

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31291 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoMerged trunk@31288 to branches/simantics-1.18 on 2015-05-15 for 1.18.2 release.
lehtonen [Fri, 15 May 2015 10:26:51 +0000 (10:26 +0000)]
Merged trunk@31288 to branches/simantics-1.18 on 2015-05-15 for 1.18.2 release.

refs #5847

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31289 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoMerged trunk@31285 to branches/simantics-1.18 on 2015-05-14 for 1.18.2 release.
lehtonen [Thu, 14 May 2015 05:54:20 +0000 (05:54 +0000)]
Merged trunk@31285 to branches/simantics-1.18 on 2015-05-14 for 1.18.2 release.

refs #5839

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31286 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoMerged trunk@31275,31277 to branches/simantics-1.18 on 2015-05-12 for 1.18.2 release.
lehtonen [Tue, 12 May 2015 12:13:21 +0000 (12:13 +0000)]
Merged trunk@31275,31277 to branches/simantics-1.18 on 2015-05-12 for 1.18.2 release.

refs #5840

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31280 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoMerged trunk@31274 to branches/simantics-1.18 on 2015-05-12 for 1.18.2 release.
lehtonen [Tue, 12 May 2015 12:11:04 +0000 (12:11 +0000)]
Merged trunk@31274 to branches/simantics-1.18 on 2015-05-12 for 1.18.2 release.

refs #5839

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31279 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoMerged trunk@31273 to branches/simantics-1.18 on 2015-05-12 for 1.18.2 release.
lehtonen [Tue, 12 May 2015 12:10:12 +0000 (12:10 +0000)]
Merged trunk@31273 to branches/simantics-1.18 on 2015-05-12 for 1.18.2 release.

refs #4556

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31278 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31268 to branches/simantics-1.18 on 2015-05-07 for 1.18.2 release.
lehtonen [Thu, 7 May 2015 12:45:30 +0000 (12:45 +0000)]
Merged trunk@31268 to branches/simantics-1.18 on 2015-05-07 for 1.18.2 release.

refs #5836

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31269 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31265 to branches/simantics-1.18 on 2015-05-07 for 1.18.1 or .2 release.
lehtonen [Thu, 7 May 2015 11:31:38 +0000 (11:31 +0000)]
Merged trunk@31265 to branches/simantics-1.18 on 2015-05-07 for 1.18.1 or .2 release.

refs #5835

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31266 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31245,31248,31249 to branches/simantics-1.18 on 2015-05-06 for 1.18...
lehtonen [Wed, 6 May 2015 06:58:10 +0000 (06:58 +0000)]
Merged trunk@31245,31248,31249 to branches/simantics-1.18 on 2015-05-06 for 1.18.1 release.

refs #5824

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31253 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31251 to branches/simantics-1.18 on 2015-05-06 for 1.18.1 release.
lehtonen [Wed, 6 May 2015 06:43:02 +0000 (06:43 +0000)]
Merged trunk@31251 to branches/simantics-1.18 on 2015-05-06 for 1.18.1 release.

refs #5828

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31252 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31244 to branches/simantics-1.18 on 2015-05-05 for 1.18.1 release.
lehtonen [Tue, 5 May 2015 11:02:39 +0000 (11:02 +0000)]
Merged trunk@31244 to branches/simantics-1.18 on 2015-05-05 for 1.18.1 release.

refs #5826

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31247 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31233 to branches/simantics-1.18 on 2015-05-03 for 1.18.1 release.
lehtonen [Sat, 2 May 2015 22:31:35 +0000 (22:31 +0000)]
Merged trunk@31233 to branches/simantics-1.18 on 2015-05-03 for 1.18.1 release.

refs #5822

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31234 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31225 to branches/simantics-1.18 on 2015-04-30 for 1.18.1 release.
lehtonen [Thu, 30 Apr 2015 11:58:19 +0000 (11:58 +0000)]
Merged trunk@31225 to branches/simantics-1.18 on 2015-04-30 for 1.18.1 release.

refs #5817

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31226 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31222 to branches/simantics-1.18 on 2015-04-30 for 1.18.1 release.
lehtonen [Thu, 30 Apr 2015 11:18:45 +0000 (11:18 +0000)]
Merged trunk@31222 to branches/simantics-1.18 on 2015-04-30 for 1.18.1 release.

refs #5812

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31224 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31215 to branches/simantics-1.18 on 2015-04-26 for 1.18.1 release.
lehtonen [Sun, 26 Apr 2015 06:36:49 +0000 (06:36 +0000)]
Merged trunk@31215 to branches/simantics-1.18 on 2015-04-26 for 1.18.1 release.

refs #5803

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31216 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31212 to branches/simantics-1.18 on 2015-04-25 for 1.18.1 release.
lehtonen [Fri, 24 Apr 2015 22:45:27 +0000 (22:45 +0000)]
Merged trunk@31212 to branches/simantics-1.18 on 2015-04-25 for 1.18.1 release.

refs #5803

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31213 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31166 to branches/simantics-1.18 on 2015-04-13 for 1.18.1 release.
lehtonen [Mon, 13 Apr 2015 12:56:38 +0000 (12:56 +0000)]
Merged trunk@31166 to branches/simantics-1.18 on 2015-04-13 for 1.18.1 release.

refs #5763

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31168 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31163 to branches/simantics-1.18 on 2015-04-13 for 1.18.1 release.
lehtonen [Mon, 13 Apr 2015 12:48:54 +0000 (12:48 +0000)]
Merged trunk@31163 to branches/simantics-1.18 on 2015-04-13 for 1.18.1 release.

refs #5706

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31165 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31155 to branches/simantics-1.18 on 2015-04-09 for 1.18.1 release.
lehtonen [Thu, 9 Apr 2015 14:09:57 +0000 (14:09 +0000)]
Merged trunk@31155 to branches/simantics-1.18 on 2015-04-09 for 1.18.1 release.

refs #5757

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31156 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31149 to branches/simantics-1.18 on 2015-04-08 for 1.18.1 release.
lehtonen [Wed, 8 Apr 2015 11:50:02 +0000 (11:50 +0000)]
Merged trunk@31149 to branches/simantics-1.18 on 2015-04-08 for 1.18.1 release.

refs #5693

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31150 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31144 to branches/simantics-1.18 on 2015-04-08 for 1.18.1 release.
lehtonen [Wed, 8 Apr 2015 06:58:19 +0000 (06:58 +0000)]
Merged trunk@31144 to branches/simantics-1.18 on 2015-04-08 for 1.18.1 release.

refs #5756

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31145 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31141 to branches/simantics-1.18 on 2015-04-07 for 1.18.1 release.
lehtonen [Tue, 7 Apr 2015 07:10:52 +0000 (07:10 +0000)]
Merged trunk@31141 to branches/simantics-1.18 on 2015-04-07 for 1.18.1 release.

refs #5669

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31142 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31133 to branches/simantics-1.18 on 2015-03-26 for 1.18.1 release.
lehtonen [Thu, 26 Mar 2015 12:15:41 +0000 (12:15 +0000)]
Merged trunk@31133 to branches/simantics-1.18 on 2015-03-26 for 1.18.1 release.

refs #5693

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31134 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31130 to branches/simantics-1.18 on 2015-03-26 for 1.18.1 release.
lehtonen [Thu, 26 Mar 2015 12:02:16 +0000 (12:02 +0000)]
Merged trunk@31130 to branches/simantics-1.18 on 2015-03-26 for 1.18.1 release.

refs #5693

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31131 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31126 to branches/simantics-1.18 on 2015-03-25 for 1.18.1 release.
lehtonen [Wed, 25 Mar 2015 09:30:13 +0000 (09:30 +0000)]
Merged trunk@31126 to branches/simantics-1.18 on 2015-03-25 for 1.18.1 release.

refs #5747

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31127 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31119 to branches/simantics-1.18 on 2015-03-24 for 1.18.1 release.
lehtonen [Tue, 24 Mar 2015 12:44:10 +0000 (12:44 +0000)]
Merged trunk@31119 to branches/simantics-1.18 on 2015-03-24 for 1.18.1 release.

refs #5745

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31120 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31106 to branches/simantics-1.18 on 2015-03-19 for 1.18.1 release.
lehtonen [Thu, 19 Mar 2015 07:58:25 +0000 (07:58 +0000)]
Merged trunk@31106 to branches/simantics-1.18 on 2015-03-19 for 1.18.1 release.

refs #5740

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31107 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31102 to branches/simantics-1.18 on 2015-03-18 for 1.18.1 release.
lehtonen [Wed, 18 Mar 2015 18:02:31 +0000 (18:02 +0000)]
Merged trunk@31102 to branches/simantics-1.18 on 2015-03-18 for 1.18.1 release.

refs #9341

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31103 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31099 to branches/simantics-1.18 on 2015-03-18 for 1.18.1 release.
lehtonen [Wed, 18 Mar 2015 11:12:59 +0000 (11:12 +0000)]
Merged trunk@31099 to branches/simantics-1.18 on 2015-03-18 for 1.18.1 release.

refs #5736

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31100 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31096 to branches/simantics-1.18 on 2015-03-17 for 1.18.1 release.
lehtonen [Tue, 17 Mar 2015 12:44:42 +0000 (12:44 +0000)]
Merged trunk@31096 to branches/simantics-1.18 on 2015-03-17 for 1.18.1 release.

refs #5735

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31097 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31093 to branches/simantics-1.18 on 2015-03-17 for 1.18.1 release.
lehtonen [Tue, 17 Mar 2015 09:51:53 +0000 (09:51 +0000)]
Merged trunk@31093 to branches/simantics-1.18 on 2015-03-17 for 1.18.1 release.

refs #5680

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31094 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31087,31088,31089,31090 to branches/simantics-1.18 on 2015-03-16 for...
lehtonen [Mon, 16 Mar 2015 11:27:55 +0000 (11:27 +0000)]
Merged trunk@31087,31088,31089,31090 to branches/simantics-1.18 on 2015-03-16 for 1.18.1 release.

refs #5724

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31091 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31082 to branches/simantics-1.18 on 2015-03-15 for 1.18.1 release.
lehtonen [Sun, 15 Mar 2015 19:53:42 +0000 (19:53 +0000)]
Merged trunk@31082 to branches/simantics-1.18 on 2015-03-15 for 1.18.1 release.

refs #5720

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31083 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31079 to branches/simantics-1.18 on 2015-03-15 for 1.18.1 release.
lehtonen [Sun, 15 Mar 2015 18:04:39 +0000 (18:04 +0000)]
Merged trunk@31079 to branches/simantics-1.18 on 2015-03-15 for 1.18.1 release.

refs #5720

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31080 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31076 to branches/simantics-1.18 on 2015-03-12 for 1.18.1 release.
lehtonen [Thu, 12 Mar 2015 18:19:54 +0000 (18:19 +0000)]
Merged trunk@31076 to branches/simantics-1.18 on 2015-03-12 for 1.18.1 release.

refs #5715

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31077 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31073 to branches/simantics-1.18 on 2015-03-12 for 1.18.1 release.
lehtonen [Thu, 12 Mar 2015 13:51:40 +0000 (13:51 +0000)]
Merged trunk@31073 to branches/simantics-1.18 on 2015-03-12 for 1.18.1 release.

refs #5718

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31074 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31069 to branches/simantics-1.18 on 2015-03-12 for 1.18.1 release.
lehtonen [Thu, 12 Mar 2015 11:01:59 +0000 (11:01 +0000)]
Merged trunk@31069 to branches/simantics-1.18 on 2015-03-12 for 1.18.1 release.

refs #5715

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31071 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31062 to branches/simantics-1.18 on 2015-03-12 for 1.18.1 release.
lehtonen [Thu, 12 Mar 2015 11:00:42 +0000 (11:00 +0000)]
Merged trunk@31062 to branches/simantics-1.18 on 2015-03-12 for 1.18.1 release.

refs #5680

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31070 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31066 to branches/simantics-1.18 on 2015-03-12 for 1.18.1 release.
lehtonen [Thu, 12 Mar 2015 08:32:56 +0000 (08:32 +0000)]
Merged trunk@31066 to branches/simantics-1.18 on 2015-03-12 for 1.18.1 release.

refs #5694

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31067 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31063 to branches/simantics-1.18 on 2015-03-11 for 1.18.1 release.
lehtonen [Wed, 11 Mar 2015 21:05:15 +0000 (21:05 +0000)]
Merged trunk@31063 to branches/simantics-1.18 on 2015-03-11 for 1.18.1 release.

refs #5670

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31065 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31026 to branches/simantics-1.18 on 2015-03-11 for 1.18.1 release.
lehtonen [Wed, 11 Mar 2015 21:04:23 +0000 (21:04 +0000)]
Merged trunk@31026 to branches/simantics-1.18 on 2015-03-11 for 1.18.1 release.

refs #5696

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31064 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31059 to branches/simantics-1.18 on 2015-03-11 for 1.18.1 release.
lehtonen [Wed, 11 Mar 2015 10:22:15 +0000 (10:22 +0000)]
Merged trunk@31059 to branches/simantics-1.18 on 2015-03-11 for 1.18.1 release.

refs #5711

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31060 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31056 to branches/simantics-1.18 on 2015-03-09 for 1.18.1 release.
lehtonen [Mon, 9 Mar 2015 11:09:47 +0000 (11:09 +0000)]
Merged trunk@31056 to branches/simantics-1.18 on 2015-03-09 for 1.18.1 release.

refs #5708

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31057 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31052 to branches/simantics-1.18 on 2015-03-08 for 1.18.1 release.
lehtonen [Sun, 8 Mar 2015 14:06:12 +0000 (14:06 +0000)]
Merged trunk@31052 to branches/simantics-1.18 on 2015-03-08 for 1.18.1 release.

refs #5706

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31053 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31050 to branches/simantics-1.18 on 2015-03-08 for 1.18.1 release.
lehtonen [Sun, 8 Mar 2015 12:47:44 +0000 (12:47 +0000)]
Merged trunk@31050 to branches/simantics-1.18 on 2015-03-08 for 1.18.1 release.

refs #4304

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31051 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31046 to branches/simantics-1.18 on 2015-03-06 for 1.18.1 release.
lehtonen [Fri, 6 Mar 2015 11:55:15 +0000 (11:55 +0000)]
Merged trunk@31046 to branches/simantics-1.18 on 2015-03-06 for 1.18.1 release.

refs #5585

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31047 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31043 to branches/simantics-1.18 on 2015-03-06 for 1.18.1 release.
lehtonen [Fri, 6 Mar 2015 10:56:52 +0000 (10:56 +0000)]
Merged trunk@31043 to branches/simantics-1.18 on 2015-03-06 for 1.18.1 release.

refs #5705

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31044 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31036 to branches/simantics-1.18 on 2015-03-05 for 1.18.1 release.
lehtonen [Thu, 5 Mar 2015 13:43:02 +0000 (13:43 +0000)]
Merged trunk@31036 to branches/simantics-1.18 on 2015-03-05 for 1.18.1 release.

refs #5669

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31039 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31037 to branches/simantics-1.18 on 2015-03-05 for 1.18.1 release.
lehtonen [Thu, 5 Mar 2015 13:38:32 +0000 (13:38 +0000)]
Merged trunk@31037 to branches/simantics-1.18 on 2015-03-05 for 1.18.1 release.

refs #5704

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31038 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31033 to branches/simantics-1.18 on 2015-03-05 for 1.18.1 release.
lehtonen [Thu, 5 Mar 2015 09:41:50 +0000 (09:41 +0000)]
Merged trunk@31033 to branches/simantics-1.18 on 2015-03-05 for 1.18.1 release.

refs #5693

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31034 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31030 to branches/simantics-1.18 on 2015-03-04 for 1.18.1 release.
lehtonen [Wed, 4 Mar 2015 20:46:44 +0000 (20:46 +0000)]
Merged trunk@31030 to branches/simantics-1.18 on 2015-03-04 for 1.18.1 release.

refs #5696

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31031 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31027 to branches/simantics-1.18 on 2015-03-04 for 1.18.1 release.
lehtonen [Wed, 4 Mar 2015 08:08:03 +0000 (08:08 +0000)]
Merged trunk@31027 to branches/simantics-1.18 on 2015-03-04 for 1.18.1 release.

refs #5699

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31028 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31015 to branches/simantics-1.18 on 2015-03-04 for 1.18.1 release.
lehtonen [Wed, 4 Mar 2015 06:28:18 +0000 (06:28 +0000)]
Merged trunk@31015 to branches/simantics-1.18 on 2015-03-04 for 1.18.1 release.

refs #5695

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31023 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31010,31016,31018 to branches/simantics-1.18 on 2015-03-04 for 1.18...
lehtonen [Wed, 4 Mar 2015 06:24:09 +0000 (06:24 +0000)]
Merged trunk@31010,31016,31018 to branches/simantics-1.18 on 2015-03-04 for 1.18.1 release.

refs #5693

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31022 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31020 to branches/simantics-1.18 on 2015-03-04 for 1.18.1 release.
lehtonen [Wed, 4 Mar 2015 06:10:43 +0000 (06:10 +0000)]
Merged trunk@31020 to branches/simantics-1.18 on 2015-03-04 for 1.18.1 release.

refs #5698

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31021 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31011 to branches/simantics-1.18 on 2015-03-03 for 1.18.1 release.
lehtonen [Tue, 3 Mar 2015 08:42:40 +0000 (08:42 +0000)]
Merged trunk@31011 to branches/simantics-1.18 on 2015-03-03 for 1.18.1 release.

refs #5694

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31012 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31003 to branches/simantics-1.18 on 2015-03-02 for 1.18.1 release.
lehtonen [Mon, 2 Mar 2015 10:32:10 +0000 (10:32 +0000)]
Merged trunk@31003 to branches/simantics-1.18 on 2015-03-02 for 1.18.1 release.

refs #5571

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31008 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31002 to branches/simantics-1.18 on 2015-03-02 for 1.18.1 release.
lehtonen [Mon, 2 Mar 2015 10:30:42 +0000 (10:30 +0000)]
Merged trunk@31002 to branches/simantics-1.18 on 2015-03-02 for 1.18.1 release.

refs #5685

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31007 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@31001 to branches/simantics-1.18 on 2015-03-02 for 1.18.1 release.
lehtonen [Mon, 2 Mar 2015 10:27:05 +0000 (10:27 +0000)]
Merged trunk@31001 to branches/simantics-1.18 on 2015-03-02 for 1.18.1 release.

refs #5680

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@31005 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30996,30997 to branches/simantics-1.18 on 2015-02-26 for 1.18.1 release.
lehtonen [Thu, 26 Feb 2015 21:05:57 +0000 (21:05 +0000)]
Merged trunk@30996,30997 to branches/simantics-1.18 on 2015-02-26 for 1.18.1 release.

refs #4304

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30999 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30995 to branches/simantics-1.18 on 2015-02-26 for 1.18.1 release.
lehtonen [Thu, 26 Feb 2015 21:04:29 +0000 (21:04 +0000)]
Merged trunk@30995 to branches/simantics-1.18 on 2015-02-26 for 1.18.1 release.

refs #5492

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30998 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30963 to branches/simantics-1.18 on 2015-02-26 for 1.18.1 release.
lehtonen [Thu, 26 Feb 2015 12:54:55 +0000 (12:54 +0000)]
Merged trunk@30963 to branches/simantics-1.18 on 2015-02-26 for 1.18.1 release.

refs #5684

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30993 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30963 to branches/simantics-1.18 on 2015-02-26 for 1.18.1 release.
lehtonen [Thu, 26 Feb 2015 12:52:49 +0000 (12:52 +0000)]
Merged trunk@30963 to branches/simantics-1.18 on 2015-02-26 for 1.18.1 release.

refs #5678

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30992 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30933,30935 to branches/simantics-1.18 on 2015-02-26 for 1.18.1 release.
lehtonen [Thu, 26 Feb 2015 12:48:23 +0000 (12:48 +0000)]
Merged trunk@30933,30935 to branches/simantics-1.18 on 2015-02-26 for 1.18.1 release.

refs #5672
refs #5575
refs #5673

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30991 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30985,30986,30987,30988 to branches/simantics-1.18 on 2015-02-26 for...
lehtonen [Wed, 25 Feb 2015 22:30:27 +0000 (22:30 +0000)]
Merged trunk@30985,30986,30987,30988 to branches/simantics-1.18 on 2015-02-26 for 1.18.1 release.

refs #5565

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30989 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30973,30974 to branches/simantics-1.18 on 2015-02-25 for 1.18.1 release.
lehtonen [Wed, 25 Feb 2015 21:26:47 +0000 (21:26 +0000)]
Merged trunk@30973,30974 to branches/simantics-1.18 on 2015-02-25 for 1.18.1 release.

refs #5680

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30981 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk:r30964-30965,30969-30971,30978 to branches/simantics-1.18 for simantics...
lehtonen [Wed, 25 Feb 2015 20:59:19 +0000 (20:59 +0000)]
Merged trunk:r30964-30965,30969-30971,30978 to branches/simantics-1.18 for simantics 1.18.1.

refs #5680

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30979 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30975 to branches/simantics-1.18 on 2015-02-25 for 1.18.1 release.
lehtonen [Wed, 25 Feb 2015 08:34:03 +0000 (08:34 +0000)]
Merged trunk@30975 to branches/simantics-1.18 on 2015-02-25 for 1.18.1 release.

refs #5682

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30976 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30966 to branches/simantics-1.18 on 2015-02-23 for 1.18.1 release.
lehtonen [Mon, 23 Feb 2015 18:31:53 +0000 (18:31 +0000)]
Merged trunk@30966 to branches/simantics-1.18 on 2015-02-23 for 1.18.1 release.

refs #5668

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30967 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30959,30960 to branches/simantics-1.18 on 2015-02-20 for 1.18.1 release.
lehtonen [Fri, 20 Feb 2015 13:17:23 +0000 (13:17 +0000)]
Merged trunk@30959,30960 to branches/simantics-1.18 on 2015-02-20 for 1.18.1 release.

refs #4304

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30961 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30952 to branches/simantics-1.18 on 2015-02-19 for 1.18.1 release.
lehtonen [Thu, 19 Feb 2015 12:32:35 +0000 (12:32 +0000)]
Merged trunk@30952 to branches/simantics-1.18 on 2015-02-19 for 1.18.1 release.

refs #5676

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30957 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30953 to branches/simantics-1.18 on 2015-02-19 for 1.18.1 release.
lehtonen [Thu, 19 Feb 2015 12:03:59 +0000 (12:03 +0000)]
Merged trunk@30953 to branches/simantics-1.18 on 2015-02-19 for 1.18.1 release.

refs #5677

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30954 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30946,30947 to branches/simantics-1.18 on 2015-02-19 for 1.18.1 release.
lehtonen [Thu, 19 Feb 2015 11:35:03 +0000 (11:35 +0000)]
Merged trunk@30946,30947 to branches/simantics-1.18 on 2015-02-19 for 1.18.1 release.

refs #5650

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30950 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30948 to branches/simantics-1.18 on 2015-02-19 for 1.18.1 release.
lehtonen [Thu, 19 Feb 2015 11:27:59 +0000 (11:27 +0000)]
Merged trunk@30948 to branches/simantics-1.18 on 2015-02-19 for 1.18.1 release.

refs #5670

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30949 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30931 to branches/simantics-1.18 on 2015-02-19 for 1.18.1 release.
lehtonen [Thu, 19 Feb 2015 08:30:04 +0000 (08:30 +0000)]
Merged trunk@30931 to branches/simantics-1.18 on 2015-02-19 for 1.18.1 release.

refs #5670

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30944 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30924 to branches/simantics-1.18 on 2015-02-18 for 1.18.1 release.
lehtonen [Wed, 18 Feb 2015 13:00:37 +0000 (13:00 +0000)]
Merged trunk@30924 to branches/simantics-1.18 on 2015-02-18 for 1.18.1 release.

refs #5667

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30942 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30939 to branches/simantics-1.18 on 2015-02-18 for 1.18.1 release.
lehtonen [Wed, 18 Feb 2015 12:17:02 +0000 (12:17 +0000)]
Merged trunk@30939 to branches/simantics-1.18 on 2015-02-18 for 1.18.1 release.

refs #5669

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30940 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30929,30930,30934 to branches/simantics-1.18 on 2015-02-18 for 1.18...
lehtonen [Wed, 18 Feb 2015 10:52:22 +0000 (10:52 +0000)]
Merged trunk@30929,30930,30934 to branches/simantics-1.18 on 2015-02-18 for 1.18.1 release.

refs #5669

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30937 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30926 to branches/simantics-1.18 on 2015-02-15 for 1.18.1 release.
lehtonen [Sat, 14 Feb 2015 22:55:04 +0000 (22:55 +0000)]
Merged trunk@30926 to branches/simantics-1.18 on 2015-02-15 for 1.18.1 release.

refs #5668

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30927 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30920 to branches/simantics-1.18 on 2015-02-13 for 1.18.1 release.
lehtonen [Thu, 12 Feb 2015 22:26:31 +0000 (22:26 +0000)]
Merged trunk@30920 to branches/simantics-1.18 on 2015-02-13 for 1.18.1 release.

refs #5650

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30921 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30917 to branches/simantics-1.18 on 2015-02-12 for 1.18.1 release.
lehtonen [Thu, 12 Feb 2015 20:41:21 +0000 (20:41 +0000)]
Merged trunk@30917 to branches/simantics-1.18 on 2015-02-12 for 1.18.1 release.

refs #5603

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30918 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30912 to branches/simantics-1.18 on 2015-02-12 for 1.18.1 release.
lehtonen [Thu, 12 Feb 2015 12:37:03 +0000 (12:37 +0000)]
Merged trunk@30912 to branches/simantics-1.18 on 2015-02-12 for 1.18.1 release.

refs #5650

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30913 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30905,30906,30907,30908 to branches/simantics-1.18 on 2015-02-12 for...
lehtonen [Thu, 12 Feb 2015 10:16:05 +0000 (10:16 +0000)]
Merged trunk@30905,30906,30907,30908 to branches/simantics-1.18 on 2015-02-12 for 1.18.1 release.

refs #5662
refs #5663

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30910 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30877 to branches/simantics-1.18 on 2015-02-11 for 1.18.1 release.
lehtonen [Thu, 12 Feb 2015 09:32:23 +0000 (09:32 +0000)]
Merged trunk@30877 to branches/simantics-1.18 on 2015-02-11 for 1.18.1 release.

refs #5651

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30909 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30900 to branches/simantics-1.18 on 2015-02-11 for 1.18.1 release.
lehtonen [Wed, 11 Feb 2015 08:16:36 +0000 (08:16 +0000)]
Merged trunk@30900 to branches/simantics-1.18 on 2015-02-11 for 1.18.1 release.

refs #5660

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30901 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30897 to branches/simantics-1.18 on 2015-02-10 for 1.18.1 release.
lehtonen [Tue, 10 Feb 2015 12:12:08 +0000 (12:12 +0000)]
Merged trunk@30897 to branches/simantics-1.18 on 2015-02-10 for 1.18.1 release.

refs #5534

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30898 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30888 to branches/simantics-1.18 on 2015-02-07 for 1.18.1 release.
lehtonen [Sat, 7 Feb 2015 17:21:30 +0000 (17:21 +0000)]
Merged trunk@30888 to branches/simantics-1.18 on 2015-02-07 for 1.18.1 release.

refs #5659

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30892 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30889 to branches/simantics-1.18 on 2015-02-07 for 1.18.1 release.
lehtonen [Sat, 7 Feb 2015 17:20:27 +0000 (17:20 +0000)]
Merged trunk@30889 to branches/simantics-1.18 on 2015-02-07 for 1.18.1 release.

refs #5657

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30891 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30887 to branches/simantics-1.18 on 2015-02-07 for 1.18.1 release.
lehtonen [Sat, 7 Feb 2015 17:19:28 +0000 (17:19 +0000)]
Merged trunk@30887 to branches/simantics-1.18 on 2015-02-07 for 1.18.1 release.

refs #5658

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30890 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30885 to branches/simantics-1.18 on 2015-02-06 for 1.18.1 release.
lehtonen [Fri, 6 Feb 2015 07:37:38 +0000 (07:37 +0000)]
Merged trunk@30885 to branches/simantics-1.18 on 2015-02-06 for 1.18.1 release.

refs #56555

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30886 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30880,30881,30882 to branches/simantics-1.18 on 2015-02-05 for 1.18...
lehtonen [Thu, 5 Feb 2015 16:13:47 +0000 (16:13 +0000)]
Merged trunk@30880,30881,30882 to branches/simantics-1.18 on 2015-02-05 for 1.18.1 release.

refs #5572

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30883 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoMerged trunk@30878 to branches/simantics-1.18 on 2015-02-05 for 1.18.1 release.
lehtonen [Thu, 5 Feb 2015 06:15:27 +0000 (06:15 +0000)]
Merged trunk@30878 to branches/simantics-1.18 on 2015-02-05 for 1.18.1 release.

refs #5572

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30879 ac1ea38d-2e2b-0410-8846-a27921b304fc

9 years agoSimantics 1.18 release branching from trunk@HEAD to branches/simantics-1.18 on 2015...
lehtonen [Wed, 4 Feb 2015 07:47:32 +0000 (07:47 +0000)]
Simantics 1.18 release branching from trunk@HEAD to branches/simantics-1.18 on 2015-02-04.

refs #5650

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/simantics-1.18@30875 ac1ea38d-2e2b-0410-8846-a27921b304fc

10 years agoFixed/ignored unnecessary warnings.
lehtonen [Fri, 3 Jan 2014 09:03:11 +0000 (09:03 +0000)]
Fixed/ignored unnecessary warnings.
refs #3552

git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@28588 ac1ea38d-2e2b-0410-8846-a27921b304fc