Merge branch 'release' of https://github.com/MikePohatu/TsGui.git

MikePohatu · Dec 4, 2016 · 6a1e98c · 6a1e98c
2 parents e9d81d0 + 31ab2fb
commit 6a1e98c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/TestConfigs/Config.14.xml b/TestConfigs/Config.14.xml
@@ -61,7 +61,7 @@
 					<Message>Desktop not valid when check box ticked</Message>			
 					<Invalid>
 						<!--Rule Type="Equals" CaseSensitive="TRUE">Desktop</Rule>-->
-						<Rule Type="RegEx" CaseSensitive="TRUE">(Desktop}</Rule>
+						<Rule Type="RegEx" CaseSensitive="TRUE">(Desktop)</Rule>
 					</Invalid>
 				</Validation>
 			</GuiOption>

diff --git a/TestConfigs/Config.xml b/TestConfigs/Config.xml
@@ -61,7 +61,7 @@
 					<Message>Desktop not valid when check box ticked</Message>			
 					<Invalid>
 						<!--Rule Type="Equals" CaseSensitive="TRUE">Desktop</Rule>-->
-						<Rule Type="RegEx" CaseSensitive="TRUE">(Desktop}</Rule>
+						<Rule Type="RegEx" CaseSensitive="TRUE">(Desktop)</Rule>
 					</Invalid>
 				</Validation>
 			</GuiOption>

diff --git a/TsGui.sln b/TsGui.sln
@@ -22,6 +22,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestConfigs", "TestConfigs"
 		TestConfigs\Config.11.xml = TestConfigs\Config.11.xml
 		TestConfigs\Config.12.xml = TestConfigs\Config.12.xml
 		TestConfigs\Config.13.xml = TestConfigs\Config.13.xml
+		TestConfigs\Config.14.xml = TestConfigs\Config.14.xml
 		TestConfigs\Config.2.xml = TestConfigs\Config.2.xml
 		TestConfigs\Config.3.xml = TestConfigs\Config.3.xml
 		TestConfigs\Config.4.xml = TestConfigs\Config.4.xml
@@ -30,6 +31,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestConfigs", "TestConfigs"
 		TestConfigs\Config.7.xml = TestConfigs\Config.7.xml
 		TestConfigs\Config.8.xml = TestConfigs\Config.8.xml
 		TestConfigs\Config.9.xml = TestConfigs\Config.9.xml
+		TestConfigs\Config.xml = TestConfigs\Config.xml
 		TestConfigs\TestConfigs.vbs = TestConfigs\TestConfigs.vbs
 	EndProjectSection
 EndProject