diff --git a/Externals/crystaledit/editlib/go.cpp b/Externals/crystaledit/editlib/go.cpp
index 19a52e9c12a..4ae6a2d7352 100644
--- 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: sdottaka@users.sourceforge.net
//
// Go syntax highlighing definition
diff --git a/Externals/crystaledit/editlib/rust.cpp b/Externals/crystaledit/editlib/rust.cpp
index 214ce0146b7..42735536870 100644
--- 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: sdottaka@users.sourceforge.net
//
// Rust syntax highlighing definition
diff --git a/Externals/poco/Foundation/Foundation.vs2015.vcxproj b/Externals/poco/Foundation/Foundation.vs2015.vcxproj
index 836c016e08f..34602fc22f2 100644
--- a/Externals/poco/Foundation/Foundation.vs2015.vcxproj
+++ b/Externals/poco/Foundation/Foundation.vs2015.vcxproj
@@ -29,22 +29,22 @@
StaticLibrary
Unicode
- v140
+ v140_xp
StaticLibrary
Unicode
- v140
+ v140_xp
StaticLibrary
Unicode
- v140
+ v140_xp
StaticLibrary
Unicode
- v140
+ v140_xp
diff --git a/Externals/poco/Foundation/Foundation.vs2015.vcxproj.filters b/Externals/poco/Foundation/Foundation.vs2015.vcxproj.filters
new file mode 100644
index 00000000000..b0bd99f1bbd
--- /dev/null
+++ b/Externals/poco/Foundation/Foundation.vs2015.vcxproj.filters
@@ -0,0 +1,1775 @@
+
+
+
+
+ {185c1200-1c1b-4fc7-9da0-b650d0c1bf77}
+
+
+ {e4438cfb-753c-4882-b6a7-37f1b2eb7924}
+
+
+ {5fef2634-dac7-4251-8cc6-685a55fb6b69}
+
+
+ {27c4af78-bbb6-41df-a186-f2a592f6dd7e}
+
+
+ {faa6333e-8acd-42d3-b72c-37cd0e19d162}
+
+
+ {d5c0096d-097d-40c2-ac9e-c52501bca586}
+
+
+ {341c25b8-2c02-4356-98af-e9cdc028d65d}
+
+
+ {dcfb473d-2dc0-419b-82e5-49a02e866436}
+
+
+ {82d7f0b3-7dcc-44f9-8982-ab3afbcc8cd8}
+
+
+ {2cf5d5b6-8945-4a08-8382-b1ae4760d23c}
+
+
+ {d7d8f3d7-1f4d-40b3-b2be-69b169947e81}
+
+
+ {4eac0cd3-fa98-44f0-ba4b-126eea40690d}
+
+
+ {641198e1-de95-4b94-8f88-740c2b199cf7}
+
+
+ {69ead8e2-e830-4352-b858-3b7fa83c6f69}
+
+
+ {86878c35-6789-4bed-96b4-27ddf9c57acd}
+
+
+ {7de594c4-642c-4ac5-b236-7056ccaa6191}
+
+
+ {74d499e8-5aec-4f63-9522-26bc8b2e4e1e}
+
+
+ {aad0de07-cbb7-4cf9-acbb-46b3c529ef72}
+
+
+ {59eea661-94fe-4cfa-a84a-3ed55d6fc6c2}
+
+
+ {0b1828a5-18ba-4155-a8f9-2c488e582c0d}
+
+
+ {ddc6a944-851d-4fae-9ae2-58c7abb800ae}
+
+
+ {96f5ad60-2335-463a-8e23-da1476ed46f2}
+
+
+ {06229b8b-13a0-43b1-8f11-53373321e5cd}
+
+
+ {5274aca5-2472-4212-a11a-7d23ff583083}
+
+
+ {c9340af5-5ac1-4082-8fee-f6343b9ab2e2}
+
+
+ {d723209d-84d0-4890-ac64-4949699f6e3a}
+
+
+ {44de33ce-ef79-4671-8258-65dc5ef863b8}
+
+
+ {39e651e5-e5c8-454d-b1f9-456c809dcf92}
+
+
+ {732e2c8f-a8af-4318-9ab9-0d8d62afae54}
+
+
+ {5d4bc826-9b0a-4014-9302-cc9f88646ff6}
+
+
+ {b8210208-8698-4cda-94fd-3e906f9ca78f}
+
+
+ {af751147-0509-4d3c-9ab3-b20c20974341}
+
+
+ {359ad015-e38e-423e-877e-c827eed229f2}
+
+
+ {3a817f74-6edb-4098-a29b-8347840a09ae}
+
+
+ {a07318ae-554f-44ec-bdfd-6fe0929c3dd3}
+
+
+ {ece427ab-b6ef-4700-9a42-312b8507a010}
+
+
+ {eb8ddeab-7b2f-4537-aa4a-939268a1a9a4}
+
+
+ {4bcbbcd9-3409-4bcc-b999-f9e360d45a09}
+
+
+ {48f74d8c-d6a2-4e5a-a322-55702b35b221}
+
+
+ {6c702a6b-e1d8-4d6e-9c48-dab631371287}
+
+
+ {e3e8d759-a950-40ed-9271-17bf7e9baa8e}
+
+
+ {3ef3d3a4-84a1-4026-85dd-53e71f3f820f}
+
+
+ {665d566f-5f8f-45d0-b883-a43185dc8ab8}
+
+
+ {51e1620d-85e0-493d-819f-960bc0957f0f}
+
+
+ {ee3f4314-64e7-420c-88d5-df016f15dd4f}
+
+
+ {bc06eae9-3602-448d-8290-4a9a68adbe8b}
+
+
+ {1a21c5ef-d4a6-42dc-94be-5a0a791ba589}
+
+
+ {dafee4e1-a8e0-4af9-bd00-378430a364ea}
+
+
+ {cb46df12-6010-4ef6-9f85-937585263f3e}
+
+
+ {50d1f7a3-d675-41b8-8370-2718b2e95c2f}
+
+
+ {f2886094-2ba3-402c-b5a8-dbfa0500e3d3}
+
+
+ {7237275f-8924-4f26-96de-066ba722f9c6}
+
+
+ {cdb9c09a-2a19-4203-a6f4-87455a799508}
+
+
+ {040f6767-8762-4b80-9db2-45a2b18c1d86}
+
+
+ {3fd772e7-f8cf-42fb-8b1b-5c49b9f79562}
+
+
+ {6e184876-2a72-4dd8-87e0-a42022d17513}
+
+
+ {251118a8-6f5b-4f8f-b19f-b953058b3820}
+
+
+ {20c16777-1fc6-4272-bf38-fef730596f73}
+
+
+ {da88549e-329c-444c-85bb-b2339bc09505}
+
+
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Core\Source Files
+
+
+ Streams\Source Files
+
+
+ Streams\Source Files
+
+
+ Streams\Source Files
+
+
+ Streams\Source Files
+
+
+ Streams\Source Files
+
+
+ Streams\Source Files
+
+
+ Streams\Source Files
+
+
+ Streams\Source Files
+
+
+ Streams\Source Files
+
+
+ Streams\Source Files
+
+
+ Streams\Source Files
+
+
+ Streams\Source Files
+
+
+ Streams\Source Files
+
+
+ Streams\Source Files
+
+
+ Streams\Source Files
+
+
+ Streams\Source Files
+
+
+ Streams\Source Files
+
+
+ Streams\Source Files
+
+
+ Streams\Source Files
+
+
+ Streams\zlib
+
+
+ Streams\zlib
+
+
+ Streams\zlib
+
+
+ Streams\zlib
+
+
+ Streams\zlib
+
+
+ Streams\zlib
+
+
+ Streams\zlib
+
+
+ Streams\zlib
+
+
+ Streams\zlib
+
+
+ Streams\zlib
+
+
+ Threading\Source Files
+
+
+ Threading\Source Files
+
+
+ Threading\Source Files
+
+
+ Threading\Source Files
+
+
+ Threading\Source Files
+
+
+ Threading\Source Files
+
+
+ Threading\Source Files
+
+
+ Threading\Source Files
+
+
+ Threading\Source Files
+
+
+ Threading\Source Files
+
+
+ Threading\Source Files
+
+
+ Threading\Source Files
+
+
+ Threading\Source Files
+
+
+ Threading\Source Files
+
+
+ Threading\Source Files
+
+
+ Threading\Source Files
+
+
+ Threading\Source Files
+
+
+ Threading\Source Files
+
+
+ Threading\Source Files
+
+
+ Threading\Source Files
+
+
+ Threading\Source Files
+
+
+ Threading\Source Files
+
+
+ Threading\Source Files
+
+
+ Threading\Source Files
+
+
+ Threading\Source Files
+
+
+ Crypt\Source Files
+
+
+ Crypt\Source Files
+
+
+ Crypt\Source Files
+
+
+ Crypt\Source Files
+
+
+ Crypt\Source Files
+
+
+ Crypt\Source Files
+
+
+ Crypt\Source Files
+
+
+ SharedLibrary\Source Files
+
+
+ SharedLibrary\Source Files
+
+
+ SharedLibrary\Source Files
+
+
+ SharedLibrary\Source Files
+
+
+ SharedLibrary\Source Files
+
+
+ SharedLibrary\Source Files
+
+
+ SharedLibrary\Source Files
+
+
+ RegularExpression\Source Files
+
+
+ RegularExpression\PCRE Source Files
+
+
+ RegularExpression\PCRE Source Files
+
+
+ RegularExpression\PCRE Source Files
+
+
+ RegularExpression\PCRE Source Files
+
+
+ RegularExpression\PCRE Source Files
+
+
+ RegularExpression\PCRE Source Files
+
+
+ RegularExpression\PCRE Source Files
+
+
+ RegularExpression\PCRE Source Files
+
+
+ RegularExpression\PCRE Source Files
+
+
+ RegularExpression\PCRE Source Files
+
+
+ RegularExpression\PCRE Source Files
+
+
+ RegularExpression\PCRE Source Files
+
+
+ RegularExpression\PCRE Source Files
+
+
+ RegularExpression\PCRE Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Logging\Source Files
+
+
+ Notifications\Source Files
+
+
+ Notifications\Source Files
+
+
+ Notifications\Source Files
+
+
+ Notifications\Source Files
+
+
+ Notifications\Source Files
+
+
+ Notifications\Source Files
+
+
+ Filesystem\Source Files
+
+
+ Filesystem\Source Files
+
+
+ Filesystem\Source Files
+
+
+ Filesystem\Source Files
+
+
+ Filesystem\Source Files
+
+
+ Filesystem\Source Files
+
+
+ Filesystem\Source Files
+
+
+ Filesystem\Source Files
+
+
+ Filesystem\Source Files
+
+
+ Filesystem\Source Files
+
+
+ Filesystem\Source Files
+
+
+ Filesystem\Source Files
+
+
+ Filesystem\Source Files
+
+
+ Filesystem\Source Files
+
+
+ Filesystem\Source Files
+
+
+ Filesystem\Source Files
+
+
+ Filesystem\Source Files
+
+
+ Processes\Source Files
+
+
+ Processes\Source Files
+
+
+ Processes\Source Files
+
+
+ Processes\Source Files
+
+
+ Processes\Source Files
+
+
+ Processes\Source Files
+
+
+ Processes\Source Files
+
+
+ Processes\Source Files
+
+
+ Processes\Source Files
+
+
+ Processes\Source Files
+
+
+ Processes\Source Files
+
+
+ Processes\Source Files
+
+
+ Processes\Source Files
+
+
+ Processes\Source Files
+
+
+ Processes\Source Files
+
+
+ Processes\Source Files
+
+
+ Processes\Source Files
+
+
+ Processes\Source Files
+
+
+ Processes\Source Files
+
+
+ Processes\Source Files
+
+
+ Processes\Source Files
+
+
+ Processes\Source Files
+
+
+ Processes\Source Files
+
+
+ Processes\Source Files
+
+
+ Processes\Source Files
+
+
+ UUID\Source Files
+
+
+ UUID\Source Files
+
+
+ DateTime\Source Files
+
+
+ DateTime\Source Files
+
+
+ DateTime\Source Files
+
+
+ DateTime\Source Files
+
+
+ DateTime\Source Files
+
+
+ DateTime\Source Files
+
+
+ DateTime\Source Files
+
+
+ DateTime\Source Files
+
+
+ DateTime\Source Files
+
+
+ DateTime\Source Files
+
+
+ DateTime\Source Files
+
+
+ Text\Source Files
+
+
+ Text\Source Files
+
+
+ Text\Source Files
+
+
+ Text\Source Files
+
+
+ Text\Source Files
+
+
+ Text\Source Files
+
+
+ Text\Source Files
+
+
+ Text\Source Files
+
+
+ Text\Source Files
+
+
+ Text\Source Files
+
+
+ Text\Source Files
+
+
+ Text\Source Files
+
+
+ Text\Source Files
+
+
+ Text\Source Files
+
+
+ URI\Source Files
+
+
+ URI\Source Files
+
+
+ URI\Source Files
+
+
+ URI\Source Files
+
+
+ Tasks\Source Files
+
+
+ Tasks\Source Files
+
+
+ Tasks\Source Files
+
+
+ Events\Source Files
+
+
+ Hashing\Source Files
+
+
+ Hashing\Source Files
+
+
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Core\Header Files
+
+
+ Streams\Header Files
+
+
+ Streams\Header Files
+
+
+ Streams\Header Files
+
+
+ Streams\Header Files
+
+
+ Streams\Header Files
+
+
+ Streams\Header Files
+
+
+ Streams\Header Files
+
+
+ Streams\Header Files
+
+
+ Streams\Header Files
+
+
+ Streams\Header Files
+
+
+ Streams\Header Files
+
+
+ Streams\Header Files
+
+
+ Streams\Header Files
+
+
+ Streams\Header Files
+
+
+ Streams\Header Files
+
+
+ Streams\Header Files
+
+
+ Streams\Header Files
+
+
+ Streams\Header Files
+
+
+ Streams\Header Files
+
+
+ Streams\Header Files
+
+
+ Streams\Header Files
+
+
+ Streams\Header Files
+
+
+ Streams\Header Files
+
+
+ Streams\Header Files
+
+
+ Streams\zlib
+
+
+ Streams\zlib
+
+
+ Streams\zlib
+
+
+ Streams\zlib
+
+
+ Streams\zlib
+
+
+ Streams\zlib
+
+
+ Streams\zlib
+
+
+ Streams\zlib
+
+
+ Streams\zlib
+
+
+ Streams\zlib
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Threading\Header Files
+
+
+ Crypt\Header Files
+
+
+ Crypt\Header Files
+
+
+ Crypt\Header Files
+
+
+ Crypt\Header Files
+
+
+ Crypt\Header Files
+
+
+ Crypt\Header Files
+
+
+ Crypt\Header Files
+
+
+ Crypt\Header Files
+
+
+ SharedLibrary\Header Files
+
+
+ SharedLibrary\Header Files
+
+
+ SharedLibrary\Header Files
+
+
+ SharedLibrary\Header Files
+
+
+ SharedLibrary\Header Files
+
+
+ SharedLibrary\Header Files
+
+
+ SharedLibrary\Header Files
+
+
+ SharedLibrary\Header Files
+
+
+ SharedLibrary\Header Files
+
+
+ SharedLibrary\Header Files
+
+
+ RegularExpression\PCRE Header Files
+
+
+ RegularExpression\PCRE Header Files
+
+
+ RegularExpression\PCRE Header Files
+
+
+ RegularExpression\PCRE Header Files
+
+
+ RegularExpression\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Logging\Header Files
+
+
+ Notifications\Header Files
+
+
+ Notifications\Header Files
+
+
+ Notifications\Header Files
+
+
+ Notifications\Header Files
+
+
+ Notifications\Header Files
+
+
+ Notifications\Header Files
+
+
+ Notifications\Header Files
+
+
+ Notifications\Header Files
+
+
+ Filesystem\Header Files
+
+
+ Filesystem\Header Files
+
+
+ Filesystem\Header Files
+
+
+ Filesystem\Header Files
+
+
+ Filesystem\Header Files
+
+
+ Filesystem\Header Files
+
+
+ Filesystem\Header Files
+
+
+ Filesystem\Header Files
+
+
+ Filesystem\Header Files
+
+
+ Filesystem\Header Files
+
+
+ Filesystem\Header Files
+
+
+ Filesystem\Header Files
+
+
+ Filesystem\Header Files
+
+
+ Filesystem\Header Files
+
+
+ Filesystem\Header Files
+
+
+ Filesystem\Header Files
+
+
+ Filesystem\Header Files
+
+
+ Processes\Header Files
+
+
+ Processes\Header Files
+
+
+ Processes\Header Files
+
+
+ Processes\Header Files
+
+
+ Processes\Header Files
+
+
+ Processes\Header Files
+
+
+ Processes\Header Files
+
+
+ Processes\Header Files
+
+
+ Processes\Header Files
+
+
+ Processes\Header Files
+
+
+ Processes\Header Files
+
+
+ Processes\Header Files
+
+
+ Processes\Header Files
+
+
+ Processes\Header Files
+
+
+ Processes\Header Files
+
+
+ Processes\Header Files
+
+
+ Processes\Header Files
+
+
+ Processes\Header Files
+
+
+ Processes\Header Files
+
+
+ Processes\Header Files
+
+
+ Processes\Header Files
+
+
+ Processes\Header Files
+
+
+ Processes\Header Files
+
+
+ Processes\Header Files
+
+
+ Processes\Header Files
+
+
+ UUID\Header Files
+
+
+ UUID\Header Files
+
+
+ DateTime\Header Files
+
+
+ DateTime\Header Files
+
+
+ DateTime\Header Files
+
+
+ DateTime\Header Files
+
+
+ DateTime\Header Files
+
+
+ DateTime\Header Files
+
+
+ DateTime\Header Files
+
+
+ DateTime\Header Files
+
+
+ DateTime\Header Files
+
+
+ Text\Header Files
+
+
+ Text\Header Files
+
+
+ Text\Header Files
+
+
+ Text\Header Files
+
+
+ Text\Header Files
+
+
+ Text\Header Files
+
+
+ Text\Header Files
+
+
+ Text\Header Files
+
+
+ Text\Header Files
+
+
+ Text\Header Files
+
+
+ Text\Header Files
+
+
+ Text\Header Files
+
+
+ Text\Header Files
+
+
+ Text\Header Files
+
+
+ URI\Header Files
+
+
+ URI\Header Files
+
+
+ URI\Header Files
+
+
+ URI\Header Files
+
+
+ Tasks\Header Files
+
+
+ Tasks\Header Files
+
+
+ Tasks\Header Files
+
+
+ Events\Header Files
+
+
+ Events\Header Files
+
+
+ Events\Header Files
+
+
+ Events\Header Files
+
+
+ Events\Header Files
+
+
+ Events\Header Files
+
+
+ Events\Header Files
+
+
+ Events\Header Files
+
+
+ Events\Header Files
+
+
+ Events\Header Files
+
+
+ Events\Header Files
+
+
+ Events\Header Files
+
+
+ Events\Header Files
+
+
+ Events\Header Files
+
+
+ Events\Header Files
+
+
+ Events\Header Files
+
+
+ Cache\Header Files
+
+
+ Cache\Header Files
+
+
+ Cache\Header Files
+
+
+ Cache\Header Files
+
+
+ Cache\Header Files
+
+
+ Cache\Header Files
+
+
+ Cache\Header Files
+
+
+ Cache\Header Files
+
+
+ Cache\Header Files
+
+
+ Cache\Header Files
+
+
+ Cache\Header Files
+
+
+ Cache\Header Files
+
+
+ Cache\Header Files
+
+
+ Cache\Header Files
+
+
+ Cache\Header Files
+
+
+ Cache\Header Files
+
+
+ Cache\Header Files
+
+
+ Cache\Header Files
+
+
+ Cache\Header Files
+
+
+ Cache\Header Files
+
+
+ Hashing\Header Files
+
+
+ Hashing\Header Files
+
+
+ Hashing\Header Files
+
+
+ Hashing\Header Files
+
+
+ Hashing\Header Files
+
+
+ Hashing\Header Files
+
+
+ Hashing\Header Files
+
+
+ Hashing\Header Files
+
+
+ Cache\Header Files
+
+
+ Events\Header Files
+
+
+
+
+ Logging\Resource Files
+
+
+
+
+
+ Logging\Message Files
+
+
+
\ No newline at end of file
diff --git a/Externals/poco/Util/Util.vs2015.vcxproj b/Externals/poco/Util/Util.vs2015.vcxproj
index 9a7113133f3..8ed43841ee5 100644
--- a/Externals/poco/Util/Util.vs2015.vcxproj
+++ b/Externals/poco/Util/Util.vs2015.vcxproj
@@ -29,22 +29,22 @@
StaticLibrary
Unicode
- v140
+ v140_xp
StaticLibrary
Unicode
- v140
+ v140_xp
StaticLibrary
Unicode
- v140
+ v140_xp
StaticLibrary
Unicode
- v140
+ v140_xp
diff --git a/Externals/poco/Util/Util.vs2015.vcxproj.filters b/Externals/poco/Util/Util.vs2015.vcxproj.filters
new file mode 100644
index 00000000000..a07364362ec
--- /dev/null
+++ b/Externals/poco/Util/Util.vs2015.vcxproj.filters
@@ -0,0 +1,246 @@
+
+
+
+
+ {311ebb1d-a38c-4b6c-8b7c-5cf891dadedd}
+
+
+ {803db29c-e14d-45a2-8d2c-fc88b4f147d5}
+
+
+ {e5b46937-b892-4a78-98e1-d7a35c85d4ba}
+
+
+ {8de9ea3e-1dab-462a-b941-ea1bcf46821c}
+
+
+ {f4dfb157-d175-4785-aaca-a0762242282d}
+
+
+ {3581238b-ef6d-4c70-a8d9-d62bc153f364}
+
+
+ {211ddb87-e230-4ceb-9d6a-83b21feb366c}
+
+
+ {40e62094-457c-47c7-89f7-48bce6e32432}
+
+
+ {85f5d041-592e-4bb7-b476-4bcc357fdf40}
+
+
+ {2fb39a29-c9bf-4406-98b5-fa050b663d28}
+
+
+ {9ba248d9-6cd8-4cd0-8e37-76e25e07a638}
+
+
+ {6f421fe8-68c5-46a9-b019-f47fed5ffb28}
+
+
+ {5c87a96d-f783-4e37-adc2-fc431c9f0f1b}
+
+
+ {93caf66a-e9ca-4c96-aa60-41ffb337bf4f}
+
+
+ {970de29d-9d9b-4a47-abf1-9537774d5404}
+
+
+ {23e87ff8-e3a5-41d4-bda3-daf85b4e4ce9}
+
+
+ {297d8e2b-aa53-40ed-b54a-c9b4c2ceff08}
+
+
+ {dfb7284e-c0b3-48eb-ae67-f662edf0fb7a}
+
+
+
+
+ Application\Header Files
+
+
+ Application\Header Files
+
+
+ Application\Header Files
+
+
+ Application\Header Files
+
+
+ Configuration\Header Files
+
+
+ Configuration\Header Files
+
+
+ Configuration\Header Files
+
+
+ Configuration\Header Files
+
+
+ Configuration\Header Files
+
+
+ Configuration\Header Files
+
+
+ Configuration\Header Files
+
+
+ Configuration\Header Files
+
+
+ Configuration\Header Files
+
+
+ Configuration\Header Files
+
+
+ Configuration\Header Files
+
+
+ Options\Header Files
+
+
+ Options\Header Files
+
+
+ Options\Header Files
+
+
+ Options\Header Files
+
+
+ Options\Header Files
+
+
+ Options\Header Files
+
+
+ Options\Header Files
+
+
+ Options\Header Files
+
+
+ Options\Header Files
+
+
+ Windows\Header Files
+
+
+ Windows\Header Files
+
+
+ Windows\Header Files
+
+
+ Util\Header Files
+
+
+ Timer\Header Files
+
+
+ Timer\Header Files
+
+
+ Timer\Header Files
+
+
+
+
+ Application\Source Files
+
+
+ Application\Source Files
+
+
+ Application\Source Files
+
+
+ Application\Source Files
+
+
+ Configuration\Source Files
+
+
+ Configuration\Source Files
+
+
+ Configuration\Source Files
+
+
+ Configuration\Source Files
+
+
+ Configuration\Source Files
+
+
+ Configuration\Source Files
+
+
+ Configuration\Source Files
+
+
+ Configuration\Source Files
+
+
+ Configuration\Source Files
+
+
+ Configuration\Source Files
+
+
+ Configuration\Source Files
+
+
+ Options\Source Files
+
+
+ Options\Source Files
+
+
+ Options\Source Files
+
+
+ Options\Source Files
+
+
+ Options\Source Files
+
+
+ Options\Source Files
+
+
+ Options\Source Files
+
+
+ Options\Source Files
+
+
+ Options\Source Files
+
+
+ Windows\Source Files
+
+
+ Windows\Source Files
+
+
+ Windows\Source Files
+
+
+ Timer\Source Files
+
+
+ Timer\Source Files
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Externals/poco/XML/XML.vs2015.vcxproj b/Externals/poco/XML/XML.vs2015.vcxproj
index 676e4ebe9d4..6e10f1e1180 100644
--- a/Externals/poco/XML/XML.vs2015.vcxproj
+++ b/Externals/poco/XML/XML.vs2015.vcxproj
@@ -29,22 +29,22 @@
StaticLibrary
Unicode
- v140
+ v140_xp
StaticLibrary
Unicode
- v140
+ v140_xp
StaticLibrary
Unicode
- v140
+ v140_xp
StaticLibrary
Unicode
- v140
+ v140_xp
diff --git a/Externals/poco/XML/XML.vs2015.vcxproj.filters b/Externals/poco/XML/XML.vs2015.vcxproj.filters
new file mode 100644
index 00000000000..175c0d1f009
--- /dev/null
+++ b/Externals/poco/XML/XML.vs2015.vcxproj.filters
@@ -0,0 +1,513 @@
+
+
+
+
+ {761d5d96-562b-4e69-a0e5-74cf597d06cd}
+
+
+ {9d2cff04-4fdd-41db-a922-44966afaa5e8}
+
+
+ {b5a5c2e7-2630-4fe2-a394-b8fdee30c055}
+
+
+ {58a7b7f9-1272-48c4-ad16-0ef775af6cbc}
+
+
+ {0493ef26-197a-4d05-b916-2ff5e7b51119}
+
+
+ {0ed2264e-1476-42e7-9aad-2f7e81ad8e55}
+
+
+ {6f1698a7-4df7-48fa-ade8-db33bcd23c1e}
+
+
+ {b4829cf4-4869-4e5d-97cd-d218af2d99c7}
+
+
+ {5c6e8198-4c99-4086-8496-cd11d1ce4c7b}
+
+
+ {3edd37a9-3f30-4eee-8d41-97e69783a4ab}
+
+
+ {27772c4e-df7e-4fcf-89c7-3c6664cf3195}
+
+
+ {f71c239d-97cb-4c57-acd8-2e5a23a89e8e}
+
+
+
+
+ XML\Header Files
+
+
+ XML\Header Files
+
+
+ XML\Header Files
+
+
+ XML\Header Files
+
+
+ XML\Header Files
+
+
+ XML\Header Files
+
+
+ XML\Header Files
+
+
+ XML\Header Files
+
+
+ XML\Header Files
+
+
+ SAX\Header Files
+
+
+ SAX\Header Files
+
+
+ SAX\Header Files
+
+
+ SAX\Header Files
+
+
+ SAX\Header Files
+
+
+ SAX\Header Files
+
+
+ SAX\Header Files
+
+
+ SAX\Header Files
+
+
+ SAX\Header Files
+
+
+ SAX\Header Files
+
+
+ SAX\Header Files
+
+
+ SAX\Header Files
+
+
+ SAX\Header Files
+
+
+ SAX\Header Files
+
+
+ SAX\Header Files
+
+
+ SAX\Header Files
+
+
+ SAX\Header Files
+
+
+ SAX\Header Files
+
+
+ SAX\Header Files
+
+
+ SAX\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ DOM\Header Files
+
+
+ Expat\Header Files
+
+
+ Expat\Header Files
+
+
+ Expat\Source Files
+
+
+ Expat\Source Files
+
+
+ Expat\Source Files
+
+
+ Expat\Source Files
+
+
+ Expat\Source Files
+
+
+ Expat\Source Files
+
+
+ Expat\Source Files
+
+
+ Expat\Source Files
+
+
+ Expat\Source Files
+
+
+ Expat\Source Files
+
+
+ Expat\Source Files
+
+
+
+
+ XML\Source Files
+
+
+ XML\Source Files
+
+
+ XML\Source Files
+
+
+ XML\Source Files
+
+
+ XML\Source Files
+
+
+ XML\Source Files
+
+
+ XML\Source Files
+
+
+ SAX\Source Files
+
+
+ SAX\Source Files
+
+
+ SAX\Source Files
+
+
+ SAX\Source Files
+
+
+ SAX\Source Files
+
+
+ SAX\Source Files
+
+
+ SAX\Source Files
+
+
+ SAX\Source Files
+
+
+ SAX\Source Files
+
+
+ SAX\Source Files
+
+
+ SAX\Source Files
+
+
+ SAX\Source Files
+
+
+ SAX\Source Files
+
+
+ SAX\Source Files
+
+
+ SAX\Source Files
+
+
+ SAX\Source Files
+
+
+ SAX\Source Files
+
+
+ SAX\Source Files
+
+
+ SAX\Source Files
+
+
+ SAX\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ DOM\Source Files
+
+
+ Expat\Source Files
+
+
+ Expat\Source Files
+
+
+ Expat\Source Files
+
+
+ Expat\Source Files
+
+
+ Expat\Source Files
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Src/Merge.vs2015.vcxproj b/Src/Merge.vs2015.vcxproj
index 221b4e510eb..fba18863557 100644
--- a/Src/Merge.vs2015.vcxproj
+++ b/Src/Merge.vs2015.vcxproj
@@ -23,32 +23,31 @@
{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}
Merge
MFCProj
- 10.0.14393.0
Application
Static
Unicode
- v140
+ v140_xp
Application
Static
Unicode
- v140
+ v140_xp
Application
Static
Unicode
- v140
+ v140_xp
Application
Static
Unicode
- v140
+ v140_xp
diff --git a/Src/MergeLang.vs2015.vcxproj b/Src/MergeLang.vs2015.vcxproj
index 43d628abc9c..8e90d2dcb2e 100644
--- a/Src/MergeLang.vs2015.vcxproj
+++ b/Src/MergeLang.vs2015.vcxproj
@@ -29,22 +29,22 @@
DynamicLibrary
Unicode
- v140
+ v140_xp
DynamicLibrary
Unicode
- v140
+ v140_xp
DynamicLibrary
Unicode
- v140
+ v140_xp
DynamicLibrary
Unicode
- v140
+ v140_xp
@@ -248,6 +248,10 @@ cscript CreateMasterPotFile.vbs
$(ProjectDir);%(AdditionalIncludeDirectories)
+
+
+
+
diff --git a/Src/MergeLang.vs2015.vcxproj.filters b/Src/MergeLang.vs2015.vcxproj.filters
new file mode 100644
index 00000000000..49ae3880744
--- /dev/null
+++ b/Src/MergeLang.vs2015.vcxproj.filters
@@ -0,0 +1,29 @@
+
+
+
+
+ VBS Scripts
+
+
+ VBS Scripts
+
+
+
+
+ {51a3b56c-eeee-43c9-a0e7-c2561a2e74fe}
+
+
+ {6ed17c4f-f8ad-4783-b08d-accd2076a66b}
+
+
+
+
+ Resource FIles
+
+
+
+
+ Resource FIles
+
+
+
\ No newline at end of file
diff --git a/Testing/GoogleTest/UnitTests/UnitTests.vs2015.vcxproj b/Testing/GoogleTest/UnitTests/UnitTests.vs2015.vcxproj
index b5ae582d6f2..6d86fbb8d9a 100644
--- a/Testing/GoogleTest/UnitTests/UnitTests.vs2015.vcxproj
+++ b/Testing/GoogleTest/UnitTests/UnitTests.vs2015.vcxproj
@@ -28,22 +28,22 @@
Application
Unicode
- v140
+ v140_xp
Application
Unicode
- v140
+ v140_xp
Application
Unicode
- v140
+ v140_xp
Application
Unicode
- v140
+ v140_xp
diff --git a/WinMerge.vs2015.sln b/WinMerge.vs2015.sln
index 770049e4660..79b113b8cc1 100644
--- a/WinMerge.vs2015.sln
+++ b/WinMerge.vs2015.sln
@@ -1,3 +1,4 @@
+
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
@@ -40,6 +41,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Batch Files", "Batch Files"
UploadToVirusTotal.cmd = UploadToVirusTotal.cmd
EndProjectSection
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VBS Scripts", "VBS Scripts", "{8B625EC8-5063-4336-84F9-AA7FD5348525}"
+ ProjectSection(SolutionItems) = preProject
+ ExpandEnvironmenStrings.vbs = ExpandEnvironmenStrings.vbs
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug Unicode|Win32 = Debug Unicode|Win32
@@ -104,5 +110,6 @@ Global
{8164D41D-B053-405B-826C-CF37AC0EF176} = {220B870C-D051-463E-997B-8C392081EE15}
{9E211743-85FE-4977-82F3-4F04B40C912D} = {220B870C-D051-463E-997B-8C392081EE15}
{6FF56CDB-787A-4714-A28C-919003F9FA6C} = {220B870C-D051-463E-997B-8C392081EE15}
+ {8B625EC8-5063-4336-84F9-AA7FD5348525} = {DC3B258E-444F-460D-8FD9-09A8165212FA}
EndGlobalSection
EndGlobal