Merge branch 'hotfix/2.0.1.0_number'

xDrivenDevelopment · Jun 11, 2014 · 2a05625 · 2a05625
2 parents 471fb55 + 2b3072e
commit 2a05625
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/UnitTestRunner.epf b/UnitTestRunner.epf
diff --git a/src/UnitTestRunner/ObjectModule.txt b/src/UnitTestRunner/ObjectModule.txt
@@ -19,7 +19,7 @@
 
 
 Функция Версия() Экспорт
-	Возврат "2.0.0.1";
+	Возврат "2.0.1.0";
 КонецФункции
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/src/UnitTestRunner/renames.txt b/src/UnitTestRunner/renames.txt
@@ -1,6 +1,6 @@
 5719adc2-89f4-4925-a175-71797b810b75-->und\5719adc2-89f4-4925-a175-71797b810b75
 5719adc2-89f4-4925-a175-71797b810b75.0-->Form\Форма
-5cf3a206-3db3-4464-b64b-1efd81585d1e.0\info-->C:\Users\aayuhanov\AppData\Local\Temp\UnitTestRunner.epf374.und\5cf3a206-3db3-4464-b64b-1efd81585d1e.0\info
+5cf3a206-3db3-4464-b64b-1efd81585d1e.0\info-->C:\Users\aayuhanov\AppData\Local\Temp\UnitTestRunner.epf581.und\5cf3a206-3db3-4464-b64b-1efd81585d1e.0\info
 5cf3a206-3db3-4464-b64b-1efd81585d1e.0\text-->ObjectModule.txt
 a6c816ea-fd9e-48f9-82f1-549b68d76c06-->und\a6c816ea-fd9e-48f9-82f1-549b68d76c06
 a6c816ea-fd9e-48f9-82f1-549b68d76c06.0-->und\a6c816ea-fd9e-48f9-82f1-549b68d76c06.0

diff --git a/src/UnitTestRunner/und/versions b/src/UnitTestRunner/und/versions
@@ -1 +1 @@
-{1,17,"c9e69ba1-02d3-4130-84f6-2d18842e2419",440f118b-a6c1-42bf-a44a-09058079ef74,"c9e69ba1-02d3-4130-84f6-2d18842e2419.0",84e492d5-6142-4440-aa91-10d80ae0014e,"",05548068-6b39-4983-92c1-4895f7b553c7,"5719adc2-89f4-4925-a175-71797b810b75.0",69b607b8-09c0-45fa-8a72-52868e1a9889,"versions",00059d74-af40-48c7-a2c5-ee7da4356046,"e54522b2-9d53-4951-8510-585b193e7360",8db6d051-f9e8-4e4d-8dae-d13bccc1acb2,"5719adc2-89f4-4925-a175-71797b810b75",7d6b307d-c80f-4140-9da8-f3f199cd9fbb,"root",4c8ea41e-1992-43a9-9a99-8a7e87c5f311,"a6c816ea-fd9e-48f9-82f1-549b68d76c06",a444bfd2-b6b4-4766-a6b2-e84bcbeb343c,"eb06628e-c9dd-41df-bac8-49528a8e463a.0",18994c7c-87a5-437f-94ca-9692a9d25254,"a6c816ea-fd9e-48f9-82f1-549b68d76c06.0",4d1882e8-f014-4b0f-9445-6d054b8cfde8,"d8ff9744-3ec3-4889-ad02-3311a6fcc093",d9c846c1-9699-420f-812a-b332d41446e0,"version",8ceb3549-f491-496d-b3e6-99f09111b390,"5cf3a206-3db3-4464-b64b-1efd81585d1e.0",13f82b2b-226b-4ce2-8582-7cf0781e2d38,"d8ff9744-3ec3-4889-ad02-3311a6fcc093.0",37bc0691-ce9e-4105-8c24-ee89b94a785d,"copyinfo",6c363c55-efef-492f-bee4-3c8b30ad4822,"eb06628e-c9dd-41df-bac8-49528a8e463a",e6b12db3-562c-4802-9ad8-05963d96f6be}
+{1,17,"c9e69ba1-02d3-4130-84f6-2d18842e2419",440f118b-a6c1-42bf-a44a-09058079ef74,"c9e69ba1-02d3-4130-84f6-2d18842e2419.0",84e492d5-6142-4440-aa91-10d80ae0014e,"",b81e60d9-780e-4215-9695-4437c525cfdd,"5719adc2-89f4-4925-a175-71797b810b75.0",69b607b8-09c0-45fa-8a72-52868e1a9889,"versions",68c999b5-22d7-4ac9-acd4-623d4147d6dc,"e54522b2-9d53-4951-8510-585b193e7360",a8420ce6-2219-4909-bade-26abefb9820a,"5719adc2-89f4-4925-a175-71797b810b75",7d6b307d-c80f-4140-9da8-f3f199cd9fbb,"root",e06c72dd-e546-4214-9733-98abc5cb8ad2,"a6c816ea-fd9e-48f9-82f1-549b68d76c06",a444bfd2-b6b4-4766-a6b2-e84bcbeb343c,"eb06628e-c9dd-41df-bac8-49528a8e463a.0",18994c7c-87a5-437f-94ca-9692a9d25254,"a6c816ea-fd9e-48f9-82f1-549b68d76c06.0",4d1882e8-f014-4b0f-9445-6d054b8cfde8,"d8ff9744-3ec3-4889-ad02-3311a6fcc093",d9c846c1-9699-420f-812a-b332d41446e0,"version",5b1c5dee-eea7-40e0-894f-fbea7fd2482b,"5cf3a206-3db3-4464-b64b-1efd81585d1e.0",cb915607-650c-4952-b1f1-57f2fe4ece34,"d8ff9744-3ec3-4889-ad02-3311a6fcc093.0",37bc0691-ce9e-4105-8c24-ee89b94a785d,"copyinfo",58bc743a-f974-4536-a848-6a4edd84f31f,"eb06628e-c9dd-41df-bac8-49528a8e463a",e6b12db3-562c-4802-9ad8-05963d96f6be}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{1,17,"c9e69ba1-02d3-4130-84f6-2d18842e2419",440f118b-a6c1-42bf-a44a-09058079ef74,"c9e69ba1-02d3-4130-84f6-2d18842e2419.0",84e492d5-6142-4440-aa91-10d80ae0014e,"",05548068-6b39-4983-92c1-4895f7b553c7,"5719adc2-89f4-4925-a175-71797b810b75.0",69b607b8-09c0-45fa-8a72-52868e1a9889,"versions",00059d74-af40-48c7-a2c5-ee7da4356046,"e54522b2-9d53-4951-8510-585b193e7360",8db6d051-f9e8-4e4d-8dae-d13bccc1acb2,"5719adc2-89f4-4925-a175-71797b810b75",7d6b307d-c80f-4140-9da8-f3f199cd9fbb,"root",4c8ea41e-1992-43a9-9a99-8a7e87c5f311,"a6c816ea-fd9e-48f9-82f1-549b68d76c06",a444bfd2-b6b4-4766-a6b2-e84bcbeb343c,"eb06628e-c9dd-41df-bac8-49528a8e463a.0",18994c7c-87a5-437f-94ca-9692a9d25254,"a6c816ea-fd9e-48f9-82f1-549b68d76c06.0",4d1882e8-f014-4b0f-9445-6d054b8cfde8,"d8ff9744-3ec3-4889-ad02-3311a6fcc093",d9c846c1-9699-420f-812a-b332d41446e0,"version",8ceb3549-f491-496d-b3e6-99f09111b390,"5cf3a206-3db3-4464-b64b-1efd81585d1e.0",13f82b2b-226b-4ce2-8582-7cf0781e2d38,"d8ff9744-3ec3-4889-ad02-3311a6fcc093.0",37bc0691-ce9e-4105-8c24-ee89b94a785d,"copyinfo",6c363c55-efef-492f-bee4-3c8b30ad4822,"eb06628e-c9dd-41df-bac8-49528a8e463a",e6b12db3-562c-4802-9ad8-05963d96f6be}
		{1,17,"c9e69ba1-02d3-4130-84f6-2d18842e2419",440f118b-a6c1-42bf-a44a-09058079ef74,"c9e69ba1-02d3-4130-84f6-2d18842e2419.0",84e492d5-6142-4440-aa91-10d80ae0014e,"",b81e60d9-780e-4215-9695-4437c525cfdd,"5719adc2-89f4-4925-a175-71797b810b75.0",69b607b8-09c0-45fa-8a72-52868e1a9889,"versions",68c999b5-22d7-4ac9-acd4-623d4147d6dc,"e54522b2-9d53-4951-8510-585b193e7360",a8420ce6-2219-4909-bade-26abefb9820a,"5719adc2-89f4-4925-a175-71797b810b75",7d6b307d-c80f-4140-9da8-f3f199cd9fbb,"root",e06c72dd-e546-4214-9733-98abc5cb8ad2,"a6c816ea-fd9e-48f9-82f1-549b68d76c06",a444bfd2-b6b4-4766-a6b2-e84bcbeb343c,"eb06628e-c9dd-41df-bac8-49528a8e463a.0",18994c7c-87a5-437f-94ca-9692a9d25254,"a6c816ea-fd9e-48f9-82f1-549b68d76c06.0",4d1882e8-f014-4b0f-9445-6d054b8cfde8,"d8ff9744-3ec3-4889-ad02-3311a6fcc093",d9c846c1-9699-420f-812a-b332d41446e0,"version",5b1c5dee-eea7-40e0-894f-fbea7fd2482b,"5cf3a206-3db3-4464-b64b-1efd81585d1e.0",cb915607-650c-4952-b1f1-57f2fe4ece34,"d8ff9744-3ec3-4889-ad02-3311a6fcc093.0",37bc0691-ce9e-4105-8c24-ee89b94a785d,"copyinfo",58bc743a-f974-4536-a848-6a4edd84f31f,"eb06628e-c9dd-41df-bac8-49528a8e463a",e6b12db3-562c-4802-9ad8-05963d96f6be}