Merge branch 'release/v1.0.6'

alkoleft · Oct 8, 2017 · 7ae11e4 · 7ae11e4
2 parents b583db7 + d1bfb7e
commit 7ae11e4
Show file tree

Hide file tree

Showing 7 changed files with 937 additions and 457 deletions.
diff --git a/CodeConsole83.epf b/CodeConsole83.epf
diff --git a/config.json b/config.json
@@ -1,3 +1,3 @@
 {
-    "proxy": "https://www.google.ru:789"
+
 }
diff --git a/precommit1c b/precommit1c
diff --git a/src/CodeConsole83/Form/Форма/Форма.bsl b/src/CodeConsole83/Form/Форма/Форма.bsl
diff --git a/src/CodeConsole83/maps.txt b/src/CodeConsole83/maps.txt
@@ -1,3 +1,3 @@
-Form\Форма\Форма.bsl-->6e6904e6-445a-4678-957b-e39d02fce6a4.0 (4 547, 6 911)
+Form\Форма\Форма.bsl-->6e6904e6-445a-4678-957b-e39d02fce6a4.0 (4 547, 7 151)
 Form\ФормаНастройкаТаблицы\Форма.bsl-->a3626ede-5b0a-440b-92ae-ae5ab4b70298.0 (627, 659)
 Form\ФормаСвойств\Форма.bsl-->2160ae20-89a5-4c06-8ef5-261700f38e89.0 (574, 599)
diff --git a/src/CodeConsole83/und/6e6904e6-445a-4678-957b-e39d02fce6a4.0 b/src/CodeConsole83/und/6e6904e6-445a-4678-957b-e39d02fce6a4.0
diff --git a/src/CodeConsole83/und/versions b/src/CodeConsole83/und/versions
@@ -1 +1 @@
-{1,12,"",50910774-0c8d-48f3-a295-37b2ba974188,"2160ae20-89a5-4c06-8ef5-261700f38e89",1cb61e2e-8ec7-46ae-b9cf-3d568244e66c,"2160ae20-89a5-4c06-8ef5-261700f38e89.0",e0df8546-4d97-4d6f-9c9f-89884f85e171,"6e6904e6-445a-4678-957b-e39d02fce6a4",029bf040-1802-49be-9685-09575fb61b79,"6e6904e6-445a-4678-957b-e39d02fce6a4.0",7751e35c-59cf-46f1-9d7b-8b53e68e28bf,"a3626ede-5b0a-440b-92ae-ae5ab4b70298",25902a15-0dad-465c-a273-ef5ea84baddc,"a3626ede-5b0a-440b-92ae-ae5ab4b70298.0",94e09388-da75-4e78-acd3-32329bfcf7b4,"ac7f7896-01c1-4bcc-abb9-dedfec899bc7",4e2c2824-4e84-4a1b-8ad9-ff2dd6486747,"copyinfo",2e86ed95-fdef-4d95-bea0-2d2f168d0389,"root",89a29e4e-2182-435e-92f8-3fa72faa0b72,"version",eab0a088-35dc-4d23-806c-38f42078d941,"versions",f0e3775f-e784-432e-8a53-939e1bc9ecf4}
+{1,12,"",f457b664-ae57-48b7-83d4-947e9789a13a,"2160ae20-89a5-4c06-8ef5-261700f38e89",9db962d3-303c-4d33-8062-c45e6cdc068e,"2160ae20-89a5-4c06-8ef5-261700f38e89.0",ac135d1a-02a6-429d-b472-9ebd8eb704b2,"6e6904e6-445a-4678-957b-e39d02fce6a4",a5334c45-84bd-455d-887a-3f41c2f08146,"6e6904e6-445a-4678-957b-e39d02fce6a4.0",20d6ad8a-2740-497e-bcc4-1b5eb7b405ff,"a3626ede-5b0a-440b-92ae-ae5ab4b70298",d133b749-62df-4c4c-b649-d8908f020b38,"a3626ede-5b0a-440b-92ae-ae5ab4b70298.0",dda4f084-0d7b-4da4-baff-cc95d3a85b76,"ac7f7896-01c1-4bcc-abb9-dedfec899bc7",3488f8bd-b266-4b36-93f1-09e7a01a9882,"copyinfo",f8a5be4a-dcb3-4593-b03e-95b318e46e4b,"root",5c5ac466-3a19-44ad-affe-d217f2df2529,"version",06d24382-e34d-4daf-bc1e-55ae25a5c176,"versions",f5c77625-58bd-41d1-992c-1a6b7a379516}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{1,12,"",50910774-0c8d-48f3-a295-37b2ba974188,"2160ae20-89a5-4c06-8ef5-261700f38e89",1cb61e2e-8ec7-46ae-b9cf-3d568244e66c,"2160ae20-89a5-4c06-8ef5-261700f38e89.0",e0df8546-4d97-4d6f-9c9f-89884f85e171,"6e6904e6-445a-4678-957b-e39d02fce6a4",029bf040-1802-49be-9685-09575fb61b79,"6e6904e6-445a-4678-957b-e39d02fce6a4.0",7751e35c-59cf-46f1-9d7b-8b53e68e28bf,"a3626ede-5b0a-440b-92ae-ae5ab4b70298",25902a15-0dad-465c-a273-ef5ea84baddc,"a3626ede-5b0a-440b-92ae-ae5ab4b70298.0",94e09388-da75-4e78-acd3-32329bfcf7b4,"ac7f7896-01c1-4bcc-abb9-dedfec899bc7",4e2c2824-4e84-4a1b-8ad9-ff2dd6486747,"copyinfo",2e86ed95-fdef-4d95-bea0-2d2f168d0389,"root",89a29e4e-2182-435e-92f8-3fa72faa0b72,"version",eab0a088-35dc-4d23-806c-38f42078d941,"versions",f0e3775f-e784-432e-8a53-939e1bc9ecf4}
		{1,12,"",f457b664-ae57-48b7-83d4-947e9789a13a,"2160ae20-89a5-4c06-8ef5-261700f38e89",9db962d3-303c-4d33-8062-c45e6cdc068e,"2160ae20-89a5-4c06-8ef5-261700f38e89.0",ac135d1a-02a6-429d-b472-9ebd8eb704b2,"6e6904e6-445a-4678-957b-e39d02fce6a4",a5334c45-84bd-455d-887a-3f41c2f08146,"6e6904e6-445a-4678-957b-e39d02fce6a4.0",20d6ad8a-2740-497e-bcc4-1b5eb7b405ff,"a3626ede-5b0a-440b-92ae-ae5ab4b70298",d133b749-62df-4c4c-b649-d8908f020b38,"a3626ede-5b0a-440b-92ae-ae5ab4b70298.0",dda4f084-0d7b-4da4-baff-cc95d3a85b76,"ac7f7896-01c1-4bcc-abb9-dedfec899bc7",3488f8bd-b266-4b36-93f1-09e7a01a9882,"copyinfo",f8a5be4a-dcb3-4593-b03e-95b318e46e4b,"root",5c5ac466-3a19-44ad-affe-d217f2df2529,"version",06d24382-e34d-4daf-bc1e-55ae25a5c176,"versions",f5c77625-58bd-41d1-992c-1a6b7a379516}