Merge pull request #31 from GreyMerlin/master

Three unrelated simple changes
WinMerge · Jul 29, 2017 · 753d12f · 753d12f
2 parents 6e4863c + 78cd397
commit 753d12f
Show file tree

Hide file tree

Showing 13 changed files with 2,600 additions and 27 deletions.
diff --git a/Externals/crystaledit/editlib/go.cpp b/Externals/crystaledit/editlib/go.cpp
@@ -3,7 +3,7 @@
 //  Version:    1.0.0.0
 //  Created:    23-Jul-2017
 //
-//  Copyright:  Stcherbatchenko Andrei Portions by Takashi Sawanaka
+//  Copyright:  Stcherbatchenko Andrei, portions by Takashi Sawanaka
 //  E-mail:     [email protected]
 //
 //  Go syntax highlighing definition

diff --git a/Externals/crystaledit/editlib/rust.cpp b/Externals/crystaledit/editlib/rust.cpp
@@ -3,7 +3,7 @@
 //  Version:    1.0.0.0
 //  Created:    23-Jul-2017
 //
-//  Copyright:  Stcherbatchenko Andrei Portions by Takashi Sawanaka
+//  Copyright:  Stcherbatchenko Andrei, portions by Takashi Sawanaka
 //  E-mail:     [email protected]
 //
 //  Rust syntax highlighing definition

diff --git a/Externals/poco/Foundation/Foundation.vs2015.vcxproj b/Externals/poco/Foundation/Foundation.vs2015.vcxproj
@@ -29,22 +29,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">