OSDN > Finden Software > System > Storage > Dateiverwaltung > WinMerge Japanese > SCM > git > winmerge-jp > Commit

WinMerge Japanese
Fork

R/O
HTTP
SSH
HTTPS

winmerge-jp: Commit

Commit MetaInfo

Revision	ae45c5913e9becf2cda40bd823a28ee357da0b19 (tree)
Zeit	2010-10-12 00:27:34
Autor	sdottaka <none@none>
Commiter	sdottaka

Log Message

Merge from rev. 7240:7241 (Tim's changes)

Ändern Zusammenfassung

modified: Src/MergeLang.vcproj (diff)
modified: Src/MergeLang.vcxproj (diff)
modified: Src/MergeLangX64.vcproj (diff)
modified: Translations/WinMerge/English.pot (diff)
modified: WinMergeX64.sln (diff)

Diff

--- a/Src/MergeLang.vcproj

+++ b/Src/MergeLang.vcproj

		@@ -46,7 +46,7 @@
46	46	<Tool
47	47	Name="VCPostBuildEventTool"
48	48	CommandLine="pushd $(InputDir)..\Translations\WinMerge
49		-UpdatePoFilesFromPotFile.vbs
	49	+cscript UpdatePoFilesFromPotFile.vbs
50	50	popd
51	51	mkdir $(InputDir)..\Build\vc71\MergeDebug\Languages\ 2> NUL
52	52	mkdir $(InputDir)..\Build\vc71\MergeRelease\Languages\ 2> NUL

		@@ -110,7 +110,7 @@ cscript CreateMasterPotFile.vbs
110	110	<Tool
111	111	Name="VCPostBuildEventTool"
112	112	CommandLine="pushd $(InputDir)..\Translations\WinMerge
113		-UpdatePoFilesFromPotFile.vbs
	113	+cscript UpdatePoFilesFromPotFile.vbs
114	114	popd
115	115	mkdir $(InputDir)..\Build\vc71\MergeDebug\Languages\ 2> NUL
116	116	mkdir $(InputDir)..\Build\vc71\MergeRelease\Languages\ 2> NUL

		@@ -174,7 +174,7 @@ cscript CreateMasterPotFile.vbs
174	174	<Tool
175	175	Name="VCPostBuildEventTool"
176	176	CommandLine="pushd $(InputDir)..\Translations\WinMerge
177		-UpdatePoFilesFromPotFile.vbs
	177	+cscript UpdatePoFilesFromPotFile.vbs
178	178	popd
179	179	mkdir $(InputDir)..\Build\vc71\MergeDebug\Languages\ 2> NUL
180	180	mkdir $(InputDir)..\Build\vc71\MergeRelease\Languages\ 2> NUL

		@@ -240,7 +240,7 @@ cscript CreateMasterPotFile.vbs
240	240	<Tool
241	241	Name="VCPostBuildEventTool"
242	242	CommandLine="pushd $(InputDir)..\Translations\WinMerge
243		-UpdatePoFilesFromPotFile.vbs
	243	+cscript UpdatePoFilesFromPotFile.vbs
244	244	popd
245	245	mkdir $(InputDir)..\Build\vc71\MergeDebug\Languages\ 2> NUL
246	246	mkdir $(InputDir)..\Build\vc71\MergeRelease\Languages\ 2> NUL

--- a/Src/MergeLang.vcxproj

+++ b/Src/MergeLang.vcxproj

		@@ -1,4 +1,4 @@
1		-<?xml version="1.0" encoding="utf-8"?>
	1	+<?xml version="1.0" encoding="utf-8"?>
2	2	<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3	3	<ItemGroup Label="ProjectConfigurations">
4	4	<ProjectConfiguration Include="Debug\|Win32">

		@@ -226,7 +226,7 @@
226	226	</Link>
227	227	<PostBuildEvent>
228	228	<Command>pushd $(ProjectDir)..\Translations\WinMerge
229		-UpdatePoFilesFromPotFile.vbs
	229	+cscript UpdatePoFilesFromPotFile.vbs
230	230	popd
231	231	mkdir $(ProjectDir)..\Build\MergeDebug\Languages\ 2> NUL
232	232	mkdir $(ProjectDir)..\Build\MergeRelease\Languages\ 2> NUL

		@@ -280,7 +280,7 @@ copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\
280	280	</Link>
281	281	<PostBuildEvent>
282	282	<Command>pushd $(ProjectDir)..\Translations\WinMerge
283		-UpdatePoFilesFromPotFile.vbs
	283	+cscript UpdatePoFilesFromPotFile.vbs
284	284	popd
285	285	mkdir $(ProjectDir)..\Build\MergeDebug\Languages\ 2> NUL
286	286	mkdir $(ProjectDir)..\Build\MergeRelease\Languages\ 2> NUL

		@@ -329,7 +329,7 @@ copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\
329	329	</Link>
330	330	<PostBuildEvent>
331	331	<Command>pushd $(ProjectDir)..\Translations\WinMerge
332		-UpdatePoFilesFromPotFile.vbs
	332	+cscript UpdatePoFilesFromPotFile.vbs
333	333	popd
334	334	mkdir $(ProjectDir)..\Build\MergeDebug\Languages\ 2> NUL
335	335	mkdir $(ProjectDir)..\Build\MergeRelease\Languages\ 2> NUL

		@@ -381,7 +381,7 @@ copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\
381	381	</Link>
382	382	<PostBuildEvent>
383	383	<Command>pushd $(ProjectDir)..\Translations\WinMerge
384		-UpdatePoFilesFromPotFile.vbs
	384	+cscript UpdatePoFilesFromPotFile.vbs
385	385	popd
386	386	mkdir $(ProjectDir)..\Build\MergeDebug\Languages\ 2> NUL
387	387	mkdir $(ProjectDir)..\Build\MergeRelease\Languages\ 2> NUL

		@@ -432,7 +432,7 @@ copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\
432	432	</Link>
433	433	<PostBuildEvent>
434	434	<Command>pushd $(ProjectDir)..\Translations\WinMerge
435		-UpdatePoFilesFromPotFile.vbs
	435	+cscript UpdatePoFilesFromPotFile.vbs
436	436	popd
437	437	mkdir $(ProjectDir)..\Build\MergeDebug\Languages\ 2> NUL
438	438	mkdir $(ProjectDir)..\Build\MergeRelease\Languages\ 2> NUL

		@@ -486,7 +486,7 @@ copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\
486	486	</Link>
487	487	<PostBuildEvent>
488	488	<Command>pushd $(ProjectDir)..\Translations\WinMerge
489		-UpdatePoFilesFromPotFile.vbs
	489	+cscript UpdatePoFilesFromPotFile.vbs
490	490	popd
491	491	mkdir $(ProjectDir)..\Build\MergeDebug\Languages\ 2> NUL
492	492	mkdir $(ProjectDir)..\Build\MergeRelease\Languages\ 2> NUL

		@@ -535,7 +535,7 @@ copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\
535	535	</Link>
536	536	<PostBuildEvent>
537	537	<Command>pushd $(ProjectDir)..\Translations\WinMerge
538		-UpdatePoFilesFromPotFile.vbs
	538	+cscript UpdatePoFilesFromPotFile.vbs
539	539	popd
540	540	mkdir $(ProjectDir)..\Build\MergeDebug\Languages\ 2> NUL
541	541	mkdir $(ProjectDir)..\Build\MergeRelease\Languages\ 2> NUL

		@@ -587,7 +587,7 @@ copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\
587	587	</Link>
588	588	<PostBuildEvent>
589	589	<Command>pushd $(ProjectDir)..\Translations\WinMerge
590		-UpdatePoFilesFromPotFile.vbs
	590	+cscript UpdatePoFilesFromPotFile.vbs
591	591	popd
592	592	mkdir $(ProjectDir)..\Build\MergeDebug\Languages\ 2> NUL
593	593	mkdir $(ProjectDir)..\Build\MergeRelease\Languages\ 2> NUL

		@@ -638,7 +638,7 @@ copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\
638	638	</Link>
639	639	<PostBuildEvent>
640	640	<Command>pushd $(ProjectDir)..\Translations\WinMerge
641		-UpdatePoFilesFromPotFile.vbs
	641	+cscript UpdatePoFilesFromPotFile.vbs
642	642	popd
643	643	mkdir $(ProjectDir)..\Build\MergeDebug\Languages\ 2> NUL
644	644	mkdir $(ProjectDir)..\Build\MergeRelease\Languages\ 2> NUL

		@@ -692,7 +692,7 @@ copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\
692	692	</Link>
693	693	<PostBuildEvent>
694	694	<Command>pushd $(ProjectDir)..\Translations\WinMerge
695		-UpdatePoFilesFromPotFile.vbs
	695	+cscript UpdatePoFilesFromPotFile.vbs
696	696	popd
697	697	mkdir $(ProjectDir)..\Build\MergeDebug\Languages\ 2> NUL
698	698	mkdir $(ProjectDir)..\Build\MergeRelease\Languages\ 2> NUL

		@@ -741,7 +741,7 @@ copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\
741	741	</Link>
742	742	<PostBuildEvent>
743	743	<Command>pushd $(ProjectDir)..\Translations\WinMerge
744		-UpdatePoFilesFromPotFile.vbs
	744	+cscript UpdatePoFilesFromPotFile.vbs
745	745	popd
746	746	mkdir $(ProjectDir)..\Build\MergeDebug\Languages\ 2> NUL
747	747	mkdir $(ProjectDir)..\Build\MergeRelease\Languages\ 2> NUL

		@@ -793,7 +793,7 @@ copy /Y "$(ProjectDir)..\Translations\WinMerge\*.po" "$(ProjectDir)..\Build\x64\
793	793	</Link>
794	794	<PostBuildEvent>
795	795	<Command>pushd $(ProjectDir)..\Translations\WinMerge
796		-UpdatePoFilesFromPotFile.vbs
	796	+cscript UpdatePoFilesFromPotFile.vbs
797	797	popd
798	798	mkdir $(ProjectDir)..\Build\MergeDebug\Languages\ 2> NUL
799	799	mkdir $(ProjectDir)..\Build\MergeRelease\Languages\ 2> NUL

		@@ -877,4 +877,4 @@ cscript CreateMasterPotFile.vbs
877	877	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
878	878	<ImportGroup Label="ExtensionTargets">
879	879	</ImportGroup>
880		-</Project>
		\ No newline at end of file
	880	+</Project>

--- a/Src/MergeLangX64.vcproj

+++ b/Src/MergeLangX64.vcproj

		@@ -97,7 +97,7 @@
97	97	/>
98	98	<Tool
99	99	Name="VCPostBuildEventTool"
100		- CommandLine="pushd $(InputDir)..\Translations\WinMerge UpdatePoFilesFromPotFile.vbs popd mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\" "
	100	+ CommandLine="pushd $(InputDir)..\Translations\WinMerge cscript UpdatePoFilesFromPotFile.vbs popd mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\" "
101	101	/>
102	102	</Configuration>
103	103	<Configuration

		@@ -179,7 +179,7 @@
179	179	/>
180	180	<Tool
181	181	Name="VCPostBuildEventTool"
182		- CommandLine="pushd $(InputDir)..\Translations\WinMerge UpdatePoFilesFromPotFile.vbs popd mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\" "
	182	+ CommandLine="pushd $(InputDir)..\Translations\WinMerge cscript UpdatePoFilesFromPotFile.vbs popd mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\" "
183	183	/>
184	184	</Configuration>
185	185	<Configuration

		@@ -258,7 +258,7 @@
258	258	/>
259	259	<Tool
260	260	Name="VCPostBuildEventTool"
261		- CommandLine="pushd $(InputDir)..\Translations\WinMerge UpdatePoFilesFromPotFile.vbs popd mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\" "
	261	+ CommandLine="pushd $(InputDir)..\Translations\WinMerge cscript UpdatePoFilesFromPotFile.vbs popd mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\" "
262	262	/>
263	263	</Configuration>
264	264	<Configuration

		@@ -338,7 +338,7 @@
338	338	/>
339	339	<Tool
340	340	Name="VCPostBuildEventTool"
341		- CommandLine="pushd $(InputDir)..\Translations\WinMerge UpdatePoFilesFromPotFile.vbs popd mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\" "
	341	+ CommandLine="pushd $(InputDir)..\Translations\WinMerge cscript UpdatePoFilesFromPotFile.vbs popd mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\" "
342	342	/>
343	343	</Configuration>
344	344	<Configuration

		@@ -419,7 +419,7 @@
419	419	/>
420	420	<Tool
421	421	Name="VCPostBuildEventTool"
422		- CommandLine="pushd $(InputDir)..\Translations\WinMerge UpdatePoFilesFromPotFile.vbs popd mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\" "
	422	+ CommandLine="pushd $(InputDir)..\Translations\WinMerge cscript UpdatePoFilesFromPotFile.vbs popd mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\" "
423	423	/>
424	424	</Configuration>
425	425	<Configuration

		@@ -501,7 +501,7 @@
501	501	/>
502	502	<Tool
503	503	Name="VCPostBuildEventTool"
504		- CommandLine="pushd $(InputDir)..\Translations\WinMerge UpdatePoFilesFromPotFile.vbs popd mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\" "
	504	+ CommandLine="pushd $(InputDir)..\Translations\WinMerge cscript UpdatePoFilesFromPotFile.vbs popd mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\" "
505	505	/>
506	506	</Configuration>
507	507	<Configuration

		@@ -580,7 +580,7 @@
580	580	/>
581	581	<Tool
582	582	Name="VCPostBuildEventTool"
583		- CommandLine="pushd $(InputDir)..\Translations\WinMerge UpdatePoFilesFromPotFile.vbs popd mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\" "
	583	+ CommandLine="pushd $(InputDir)..\Translations\WinMerge cscript UpdatePoFilesFromPotFile.vbs popd mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\" "
584	584	/>
585	585	</Configuration>
586	586	<Configuration

		@@ -660,7 +660,7 @@
660	660	/>
661	661	<Tool
662	662	Name="VCPostBuildEventTool"
663		- CommandLine="pushd $(InputDir)..\Translations\WinMerge UpdatePoFilesFromPotFile.vbs popd mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\" "
	663	+ CommandLine="pushd $(InputDir)..\Translations\WinMerge cscript UpdatePoFilesFromPotFile.vbs popd mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\" "
664	664	/>
665	665	</Configuration>
666	666	<Configuration

		@@ -741,7 +741,7 @@
741	741	/>
742	742	<Tool
743	743	Name="VCPostBuildEventTool"
744		- CommandLine="pushd $(InputDir)..\Translations\WinMerge UpdatePoFilesFromPotFile.vbs popd mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\" "
	744	+ CommandLine="pushd $(InputDir)..\Translations\WinMerge cscript UpdatePoFilesFromPotFile.vbs popd mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\" "
745	745	/>
746	746	</Configuration>
747	747	<Configuration

		@@ -823,7 +823,7 @@
823	823	/>
824	824	<Tool
825	825	Name="VCPostBuildEventTool"
826		- CommandLine="pushd $(InputDir)..\Translations\WinMerge UpdatePoFilesFromPotFile.vbs popd mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\" "
	826	+ CommandLine="pushd $(InputDir)..\Translations\WinMerge cscript UpdatePoFilesFromPotFile.vbs popd mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\" "
827	827	/>
828	828	</Configuration>
829	829	<Configuration

		@@ -902,7 +902,7 @@
902	902	/>
903	903	<Tool
904	904	Name="VCPostBuildEventTool"
905		- CommandLine="pushd $(InputDir)..\Translations\WinMerge UpdatePoFilesFromPotFile.vbs popd mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\" "
	905	+ CommandLine="pushd $(InputDir)..\Translations\WinMerge cscript UpdatePoFilesFromPotFile.vbs popd mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\" "
906	906	/>
907	907	</Configuration>
908	908	<Configuration

		@@ -982,7 +982,7 @@
982	982	/>
983	983	<Tool
984	984	Name="VCPostBuildEventTool"
985		- CommandLine="pushd $(InputDir)..\Translations\WinMerge UpdatePoFilesFromPotFile.vbs popd mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\" "
	985	+ CommandLine="pushd $(InputDir)..\Translations\WinMerge cscript UpdatePoFilesFromPotFile.vbs popd mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\" copy /Y "$(InputDir)..\Translations\WinMerge\.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\" "
986	986	/>
987	987	</Configuration>
988	988	</Configurations>

--- a/Translations/WinMerge/English.pot

+++ b/Translations/WinMerge/English.pot

		@@ -8,7 +8,7 @@ msgid ""
8	8	msgstr ""
9	9	"Project-Id-Version: WinMerge\n"
10	10	"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
11		-"POT-Creation-Date: 2010-07-11 10:49+0000\n"
	11	+"POT-Creation-Date: 2010-10-12 00:05+0000\n"
12	12	"PO-Revision-Date: \n"
13	13	"Last-Translator: \n"
14	14	"Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"

--- a/WinMergeX64.sln

+++ b/WinMergeX64.sln

		@@ -1,185 +1,185 @@
1		-Microsoft Visual Studio Solution File, Format Version 10.00
2		-# Visual Studio 2008
3		-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Merge", "Src\MergeX64.vcproj", "{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}"
4		- ProjectSection(ProjectDependencies) = postProject
5		- {D6B50065-7185-4E20-A499-E78276066E6F} = {D6B50065-7185-4E20-A499-E78276066E6F}
6		- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1} = {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}
7		- {D87729EA-38DF-4025-AA98-22F2438DF995} = {D87729EA-38DF-4025-AA98-22F2438DF995}
8		- EndProjectSection
9		-EndProject
10		-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat", "Externals\expat\lib\expatX64.vcproj", "{657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}"
11		-EndProject
12		-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", "Externals\pcre\Win32\pcreX64.vcproj", "{D6B50065-7185-4E20-A499-E78276066E6F}"
13		-EndProject
14		-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scew", "Externals\scew\win32\scewX64.vcproj", "{D87729EA-38DF-4025-AA98-22F2438DF995}"
15		- ProjectSection(ProjectDependencies) = postProject
16		- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1} = {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}
17		- EndProjectSection
18		-EndProject
19		-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeLang", "Src\MergeLangX64.vcproj", "{4B011DDA-2279-437D-903C-8028913AF31B}"
20		-EndProject
21		-Global
22		- GlobalSection(SolutionConfigurationPlatforms) = preSolution
23		- Debug Unicode\|Win32 = Debug Unicode\|Win32
24		- Debug Unicode\|x64 = Debug Unicode\|x64
25		- Debug\|Win32 = Debug\|Win32
26		- Debug\|x64 = Debug\|x64
27		- Release Unicode\|Win32 = Release Unicode\|Win32
28		- Release Unicode\|x64 = Release Unicode\|x64
29		- Release\|Win32 = Release\|Win32
30		- Release\|x64 = Release\|x64
31		- X64 Debug\|Win32 = X64 Debug\|Win32
32		- X64 Debug\|x64 = X64 Debug\|x64
33		- X64 Release\|Win32 = X64 Release\|Win32
34		- X64 Release\|x64 = X64 Release\|x64
35		- EndGlobalSection
36		- GlobalSection(ProjectConfigurationPlatforms) = postSolution
37		- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode\|Win32.ActiveCfg = UnicodeDebug\|Win32
38		- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode\|Win32.Build.0 = UnicodeDebug\|Win32
39		- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode\|x64.ActiveCfg = UnicodeDebug\|x64
40		- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode\|x64.Build.0 = UnicodeDebug\|x64
41		- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug\|Win32.ActiveCfg = Debug\|Win32
42		- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug\|Win32.Build.0 = Debug\|Win32
43		- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug\|x64.ActiveCfg = Debug\|x64
44		- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug\|x64.Build.0 = Debug\|x64
45		- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode\|Win32.ActiveCfg = UnicodeRelease\|Win32
46		- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode\|Win32.Build.0 = UnicodeRelease\|Win32
47		- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode\|x64.ActiveCfg = UnicodeRelease\|x64
48		- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode\|x64.Build.0 = UnicodeRelease\|x64
49		- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release\|Win32.ActiveCfg = Release\|Win32
50		- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release\|Win32.Build.0 = Release\|Win32
51		- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release\|x64.ActiveCfg = Release\|x64
52		- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release\|x64.Build.0 = Release\|x64
53		- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.X64 Debug\|Win32.ActiveCfg = X64 Debug\|x64
54		- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.X64 Debug\|Win32.Build.0 = X64 Debug\|x64
55		- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.X64 Debug\|x64.ActiveCfg = X64 Debug\|x64
56		- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.X64 Debug\|x64.Build.0 = X64 Debug\|x64
57		- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.X64 Release\|Win32.ActiveCfg = X64 Release\|Win32
58		- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.X64 Release\|Win32.Build.0 = X64 Release\|Win32
59		- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.X64 Release\|x64.ActiveCfg = X64 Release\|x64
60		- {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.X64 Release\|x64.Build.0 = X64 Release\|x64
61		- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Debug Unicode\|Win32.ActiveCfg = Debug\|Win32
62		- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Debug Unicode\|Win32.Build.0 = Debug\|Win32
63		- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Debug Unicode\|x64.ActiveCfg = Debug\|x64
64		- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Debug Unicode\|x64.Build.0 = Debug\|x64
65		- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Debug\|Win32.ActiveCfg = Debug\|Win32
66		- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Debug\|Win32.Build.0 = Debug\|Win32
67		- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Debug\|x64.ActiveCfg = Debug\|x64
68		- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Debug\|x64.Build.0 = Debug\|x64
69		- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Release Unicode\|Win32.ActiveCfg = Release\|Win32
70		- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Release Unicode\|Win32.Build.0 = Release\|Win32
71		- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Release Unicode\|x64.ActiveCfg = Release\|x64
72		- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Release Unicode\|x64.Build.0 = Release\|x64
73		- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Release\|Win32.ActiveCfg = Release\|Win32
74		- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Release\|Win32.Build.0 = Release\|Win32
75		- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Release\|x64.ActiveCfg = Release\|x64
76		- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Release\|x64.Build.0 = Release\|x64
77		- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.X64 Debug\|Win32.ActiveCfg = X64 Debug\|x64
78		- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.X64 Debug\|Win32.Build.0 = X64 Debug\|x64
79		- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.X64 Debug\|x64.ActiveCfg = X64 Debug\|x64
80		- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.X64 Debug\|x64.Build.0 = X64 Debug\|x64
81		- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.X64 Release\|Win32.ActiveCfg = X64 Release\|Win32
82		- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.X64 Release\|Win32.Build.0 = X64 Release\|Win32
83		- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.X64 Release\|x64.ActiveCfg = X64 Release\|x64
84		- {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.X64 Release\|x64.Build.0 = X64 Release\|x64
85		- {D6B50065-7185-4E20-A499-E78276066E6F}.Debug Unicode\|Win32.ActiveCfg = Debug\|Win32
86		- {D6B50065-7185-4E20-A499-E78276066E6F}.Debug Unicode\|Win32.Build.0 = Debug\|Win32
87		- {D6B50065-7185-4E20-A499-E78276066E6F}.Debug Unicode\|x64.ActiveCfg = Debug\|x64
88		- {D6B50065-7185-4E20-A499-E78276066E6F}.Debug Unicode\|x64.Build.0 = Debug\|x64
89		- {D6B50065-7185-4E20-A499-E78276066E6F}.Debug\|Win32.ActiveCfg = Debug\|Win32
90		- {D6B50065-7185-4E20-A499-E78276066E6F}.Debug\|Win32.Build.0 = Debug\|Win32
91		- {D6B50065-7185-4E20-A499-E78276066E6F}.Debug\|x64.ActiveCfg = Debug\|x64
92		- {D6B50065-7185-4E20-A499-E78276066E6F}.Debug\|x64.Build.0 = Debug\|x64
93		- {D6B50065-7185-4E20-A499-E78276066E6F}.Release Unicode\|Win32.ActiveCfg = MinSizeRel\|Win32
94		- {D6B50065-7185-4E20-A499-E78276066E6F}.Release Unicode\|Win32.Build.0 = MinSizeRel\|Win32
95		- {D6B50065-7185-4E20-A499-E78276066E6F}.Release Unicode\|x64.ActiveCfg = MinSizeRel\|x64
96		- {D6B50065-7185-4E20-A499-E78276066E6F}.Release Unicode\|x64.Build.0 = MinSizeRel\|x64
97		- {D6B50065-7185-4E20-A499-E78276066E6F}.Release\|Win32.ActiveCfg = MinSizeRel\|Win32
98		- {D6B50065-7185-4E20-A499-E78276066E6F}.Release\|Win32.Build.0 = MinSizeRel\|Win32
99		- {D6B50065-7185-4E20-A499-E78276066E6F}.Release\|x64.ActiveCfg = MinSizeRel\|x64
100		- {D6B50065-7185-4E20-A499-E78276066E6F}.Release\|x64.Build.0 = MinSizeRel\|x64
101		- {D6B50065-7185-4E20-A499-E78276066E6F}.X64 Debug\|Win32.ActiveCfg = X64 Debug\|x64
102		- {D6B50065-7185-4E20-A499-E78276066E6F}.X64 Debug\|Win32.Build.0 = X64 Debug\|x64
103		- {D6B50065-7185-4E20-A499-E78276066E6F}.X64 Debug\|x64.ActiveCfg = X64 Debug\|x64
104		- {D6B50065-7185-4E20-A499-E78276066E6F}.X64 Debug\|x64.Build.0 = X64 Debug\|x64
105		- {D6B50065-7185-4E20-A499-E78276066E6F}.X64 Release\|Win32.ActiveCfg = X64 Release\|Win32
106		- {D6B50065-7185-4E20-A499-E78276066E6F}.X64 Release\|Win32.Build.0 = X64 Release\|Win32
107		- {D6B50065-7185-4E20-A499-E78276066E6F}.X64 Release\|x64.ActiveCfg = X64 Release\|x64
108		- {D6B50065-7185-4E20-A499-E78276066E6F}.X64 Release\|x64.Build.0 = X64 Release\|x64
109		- {D87729EA-38DF-4025-AA98-22F2438DF995}.Debug Unicode\|Win32.ActiveCfg = Debug\|Win32
110		- {D87729EA-38DF-4025-AA98-22F2438DF995}.Debug Unicode\|Win32.Build.0 = Debug\|Win32
111		- {D87729EA-38DF-4025-AA98-22F2438DF995}.Debug Unicode\|x64.ActiveCfg = Debug\|x64
112		- {D87729EA-38DF-4025-AA98-22F2438DF995}.Debug Unicode\|x64.Build.0 = Debug\|x64
113		- {D87729EA-38DF-4025-AA98-22F2438DF995}.Debug\|Win32.ActiveCfg = Debug\|Win32
114		- {D87729EA-38DF-4025-AA98-22F2438DF995}.Debug\|Win32.Build.0 = Debug\|Win32
115		- {D87729EA-38DF-4025-AA98-22F2438DF995}.Debug\|x64.ActiveCfg = Debug\|x64
116		- {D87729EA-38DF-4025-AA98-22F2438DF995}.Debug\|x64.Build.0 = Debug\|x64
117		- {D87729EA-38DF-4025-AA98-22F2438DF995}.Release Unicode\|Win32.ActiveCfg = Release\|Win32
118		- {D87729EA-38DF-4025-AA98-22F2438DF995}.Release Unicode\|Win32.Build.0 = Release\|Win32
119		- {D87729EA-38DF-4025-AA98-22F2438DF995}.Release Unicode\|x64.ActiveCfg = Release\|x64
120		- {D87729EA-38DF-4025-AA98-22F2438DF995}.Release Unicode\|x64.Build.0 = Release\|x64
121		- {D87729EA-38DF-4025-AA98-22F2438DF995}.Release\|Win32.ActiveCfg = Release\|Win32
122		- {D87729EA-38DF-4025-AA98-22F2438DF995}.Release\|Win32.Build.0 = Release\|Win32
123		- {D87729EA-38DF-4025-AA98-22F2438DF995}.Release\|x64.ActiveCfg = Release\|x64
124		- {D87729EA-38DF-4025-AA98-22F2438DF995}.Release\|x64.Build.0 = Release\|x64
125		- {D87729EA-38DF-4025-AA98-22F2438DF995}.X64 Debug\|Win32.ActiveCfg = X64 Debug\|x64
126		- {D87729EA-38DF-4025-AA98-22F2438DF995}.X64 Debug\|Win32.Build.0 = X64 Debug\|x64
127		- {D87729EA-38DF-4025-AA98-22F2438DF995}.X64 Debug\|x64.ActiveCfg = X64 Debug\|x64
128		- {D87729EA-38DF-4025-AA98-22F2438DF995}.X64 Debug\|x64.Build.0 = X64 Debug\|x64
129		- {D87729EA-38DF-4025-AA98-22F2438DF995}.X64 Release\|Win32.ActiveCfg = X64 Release\|Win32
130		- {D87729EA-38DF-4025-AA98-22F2438DF995}.X64 Release\|Win32.Build.0 = X64 Release\|Win32
131		- {D87729EA-38DF-4025-AA98-22F2438DF995}.X64 Release\|x64.ActiveCfg = X64 Release\|x64
132		- {D87729EA-38DF-4025-AA98-22F2438DF995}.X64 Release\|x64.Build.0 = X64 Release\|x64
133		- {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode\|Win32.ActiveCfg = UnicodeDebug\|Win32
134		- {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode\|Win32.Build.0 = UnicodeDebug\|Win32
135		- {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode\|x64.ActiveCfg = UnicodeDebug\|x64
136		- {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode\|x64.Build.0 = UnicodeDebug\|x64
137		- {4B011DDA-2279-437D-903C-8028913AF31B}.Debug\|Win32.ActiveCfg = Debug\|Win32
138		- {4B011DDA-2279-437D-903C-8028913AF31B}.Debug\|Win32.Build.0 = Debug\|Win32
139		- {4B011DDA-2279-437D-903C-8028913AF31B}.Debug\|x64.ActiveCfg = Debug\|x64
140		- {4B011DDA-2279-437D-903C-8028913AF31B}.Debug\|x64.Build.0 = Debug\|x64
141		- {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode\|Win32.ActiveCfg = UnicodeRelease\|Win32
142		- {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode\|Win32.Build.0 = UnicodeRelease\|Win32
143		- {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode\|x64.ActiveCfg = UnicodeRelease\|x64
144		- {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode\|x64.Build.0 = UnicodeRelease\|x64
145		- {4B011DDA-2279-437D-903C-8028913AF31B}.Release\|Win32.ActiveCfg = Release\|Win32
146		- {4B011DDA-2279-437D-903C-8028913AF31B}.Release\|Win32.Build.0 = Release\|Win32
147		- {4B011DDA-2279-437D-903C-8028913AF31B}.Release\|x64.ActiveCfg = Release\|x64
148		- {4B011DDA-2279-437D-903C-8028913AF31B}.Release\|x64.Build.0 = Release\|x64
149		- {4B011DDA-2279-437D-903C-8028913AF31B}.X64 Debug\|Win32.ActiveCfg = X64 Debug\|x64
150		- {4B011DDA-2279-437D-903C-8028913AF31B}.X64 Debug\|Win32.Build.0 = X64 Debug\|x64
151		- {4B011DDA-2279-437D-903C-8028913AF31B}.X64 Debug\|x64.ActiveCfg = X64 Debug\|x64
152		- {4B011DDA-2279-437D-903C-8028913AF31B}.X64 Debug\|x64.Build.0 = X64 Debug\|x64
153		- {4B011DDA-2279-437D-903C-8028913AF31B}.X64 Release\|Win32.ActiveCfg = X64 Release\|Win32
154		- {4B011DDA-2279-437D-903C-8028913AF31B}.X64 Release\|Win32.Build.0 = X64 Release\|Win32
155		- {4B011DDA-2279-437D-903C-8028913AF31B}.X64 Release\|x64.ActiveCfg = X64 Release\|x64
156		- {4B011DDA-2279-437D-903C-8028913AF31B}.X64 Release\|x64.Build.0 = X64 Release\|x64
157		- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug Unicode\|Win32.ActiveCfg = UnicodeDebug\|Win32
158		- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug Unicode\|Win32.Build.0 = UnicodeDebug\|Win32
159		- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug Unicode\|x64.ActiveCfg = UnicodeDebug\|x64
160		- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug Unicode\|x64.Build.0 = UnicodeDebug\|x64
161		- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug\|Win32.ActiveCfg = Debug\|Win32
162		- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug\|Win32.Build.0 = Debug\|Win32
163		- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug\|x64.ActiveCfg = Debug\|x64
164		- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug\|x64.Build.0 = Debug\|x64
165		- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release Unicode\|Win32.ActiveCfg = UnicodeRelease\|Win32
166		- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release Unicode\|Win32.Build.0 = UnicodeRelease\|Win32
167		- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release Unicode\|x64.ActiveCfg = UnicodeRelease\|x64
168		- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release Unicode\|x64.Build.0 = UnicodeRelease\|x64
169		- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release\|Win32.ActiveCfg = Release\|Win32
170		- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release\|Win32.Build.0 = Release\|Win32
171		- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release\|x64.ActiveCfg = Release\|x64
172		- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release\|x64.Build.0 = Release\|x64
173		- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Debug\|Win32.ActiveCfg = X64 Debug\|x64
174		- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Debug\|Win32.Build.0 = X64 Debug\|x64
175		- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Debug\|x64.ActiveCfg = X64 Debug\|x64
176		- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Debug\|x64.Build.0 = X64 Debug\|x64
177		- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Release\|Win32.ActiveCfg = X64 Release\|Win32
178		- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Release\|Win32.Build.0 = X64 Release\|Win32
179		- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Release\|x64.ActiveCfg = X64 Release\|x64
180		- {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Release\|x64.Build.0 = X64 Release\|x64
181		- EndGlobalSection
182		- GlobalSection(SolutionProperties) = preSolution
183		- HideSolutionNode = FALSE
184		- EndGlobalSection
185		-EndGlobal
	1	+Microsoft Visual Studio Solution File, Format Version 10.00
	2	+# Visual Studio 2008
	3	+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Merge", "Src\MergeX64.vcproj", "{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}"
	4	+ ProjectSection(ProjectDependencies) = postProject
	5	+ {D6B50065-7185-4E20-A499-E78276066E6F} = {D6B50065-7185-4E20-A499-E78276066E6F}
	6	+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1} = {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}
	7	+ {D87729EA-38DF-4025-AA98-22F2438DF995} = {D87729EA-38DF-4025-AA98-22F2438DF995}
	8	+ EndProjectSection
	9	+EndProject
	10	+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat", "Externals\expat\lib\expatX64.vcproj", "{657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}"
	11	+EndProject
	12	+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", "Externals\pcre\Win32\pcreX64.vcproj", "{D6B50065-7185-4E20-A499-E78276066E6F}"
	13	+EndProject
	14	+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scew", "Externals\scew\win32\scewX64.vcproj", "{D87729EA-38DF-4025-AA98-22F2438DF995}"
	15	+ ProjectSection(ProjectDependencies) = postProject
	16	+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1} = {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}
	17	+ EndProjectSection
	18	+EndProject
	19	+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeLang", "Src\MergeLangX64.vcproj", "{4B011DDA-2279-437D-903C-8028913AF31B}"
	20	+EndProject
	21	+Global
	22	+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
	23	+ Debug Unicode\|Win32 = Debug Unicode\|Win32
	24	+ Debug Unicode\|x64 = Debug Unicode\|x64
	25	+ Debug\|Win32 = Debug\|Win32
	26	+ Debug\|x64 = Debug\|x64
	27	+ Release Unicode\|Win32 = Release Unicode\|Win32
	28	+ Release Unicode\|x64 = Release Unicode\|x64
	29	+ Release\|Win32 = Release\|Win32
	30	+ Release\|x64 = Release\|x64
	31	+ X64 Debug\|Win32 = X64 Debug\|Win32
	32	+ X64 Debug\|x64 = X64 Debug\|x64
	33	+ X64 Release\|Win32 = X64 Release\|Win32
	34	+ X64 Release\|x64 = X64 Release\|x64
	35	+ EndGlobalSection
	36	+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
	37	+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode\|Win32.ActiveCfg = UnicodeDebug\|Win32
	38	+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode\|Win32.Build.0 = UnicodeDebug\|Win32
	39	+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode\|x64.ActiveCfg = UnicodeDebug\|x64
	40	+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode\|x64.Build.0 = UnicodeDebug\|x64
	41	+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug\|Win32.ActiveCfg = Debug\|Win32
	42	+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug\|Win32.Build.0 = Debug\|Win32
	43	+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug\|x64.ActiveCfg = Debug\|x64
	44	+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug\|x64.Build.0 = Debug\|x64
	45	+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode\|Win32.ActiveCfg = UnicodeRelease\|Win32
	46	+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode\|Win32.Build.0 = UnicodeRelease\|Win32
	47	+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode\|x64.ActiveCfg = UnicodeRelease\|x64
	48	+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode\|x64.Build.0 = UnicodeRelease\|x64
	49	+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release\|Win32.ActiveCfg = Release\|Win32
	50	+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release\|Win32.Build.0 = Release\|Win32
	51	+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release\|x64.ActiveCfg = Release\|x64
	52	+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release\|x64.Build.0 = Release\|x64
	53	+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.X64 Debug\|Win32.ActiveCfg = X64 Debug\|x64
	54	+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.X64 Debug\|Win32.Build.0 = X64 Debug\|x64
	55	+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.X64 Debug\|x64.ActiveCfg = X64 Debug\|x64
	56	+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.X64 Debug\|x64.Build.0 = X64 Debug\|x64
	57	+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.X64 Release\|Win32.ActiveCfg = X64 Release\|Win32
	58	+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.X64 Release\|Win32.Build.0 = X64 Release\|Win32
	59	+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.X64 Release\|x64.ActiveCfg = X64 Release\|x64
	60	+ {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.X64 Release\|x64.Build.0 = X64 Release\|x64
	61	+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Debug Unicode\|Win32.ActiveCfg = Debug\|Win32
	62	+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Debug Unicode\|Win32.Build.0 = Debug\|Win32
	63	+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Debug Unicode\|x64.ActiveCfg = Debug\|x64
	64	+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Debug Unicode\|x64.Build.0 = Debug\|x64
	65	+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Debug\|Win32.ActiveCfg = Debug\|Win32
	66	+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Debug\|Win32.Build.0 = Debug\|Win32
	67	+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Debug\|x64.ActiveCfg = Debug\|x64
	68	+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Debug\|x64.Build.0 = Debug\|x64
	69	+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Release Unicode\|Win32.ActiveCfg = Release\|Win32
	70	+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Release Unicode\|Win32.Build.0 = Release\|Win32
	71	+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Release Unicode\|x64.ActiveCfg = Release\|x64
	72	+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Release Unicode\|x64.Build.0 = Release\|x64
	73	+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Release\|Win32.ActiveCfg = Release\|Win32
	74	+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Release\|Win32.Build.0 = Release\|Win32
	75	+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Release\|x64.ActiveCfg = Release\|x64
	76	+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.Release\|x64.Build.0 = Release\|x64
	77	+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.X64 Debug\|Win32.ActiveCfg = X64 Debug\|x64
	78	+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.X64 Debug\|Win32.Build.0 = X64 Debug\|x64
	79	+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.X64 Debug\|x64.ActiveCfg = X64 Debug\|x64
	80	+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.X64 Debug\|x64.Build.0 = X64 Debug\|x64
	81	+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.X64 Release\|Win32.ActiveCfg = X64 Release\|Win32
	82	+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.X64 Release\|Win32.Build.0 = X64 Release\|Win32
	83	+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.X64 Release\|x64.ActiveCfg = X64 Release\|x64
	84	+ {657F1CB0-7CBB-4479-A2C9-AE08D9DC30F1}.X64 Release\|x64.Build.0 = X64 Release\|x64
	85	+ {D6B50065-7185-4E20-A499-E78276066E6F}.Debug Unicode\|Win32.ActiveCfg = Debug\|Win32
	86	+ {D6B50065-7185-4E20-A499-E78276066E6F}.Debug Unicode\|Win32.Build.0 = Debug\|Win32
	87	+ {D6B50065-7185-4E20-A499-E78276066E6F}.Debug Unicode\|x64.ActiveCfg = Debug\|x64
	88	+ {D6B50065-7185-4E20-A499-E78276066E6F}.Debug Unicode\|x64.Build.0 = Debug\|x64
	89	+ {D6B50065-7185-4E20-A499-E78276066E6F}.Debug\|Win32.ActiveCfg = Debug\|Win32
	90	+ {D6B50065-7185-4E20-A499-E78276066E6F}.Debug\|Win32.Build.0 = Debug\|Win32
	91	+ {D6B50065-7185-4E20-A499-E78276066E6F}.Debug\|x64.ActiveCfg = Debug\|x64
	92	+ {D6B50065-7185-4E20-A499-E78276066E6F}.Debug\|x64.Build.0 = Debug\|x64
	93	+ {D6B50065-7185-4E20-A499-E78276066E6F}.Release Unicode\|Win32.ActiveCfg = MinSizeRel\|Win32
	94	+ {D6B50065-7185-4E20-A499-E78276066E6F}.Release Unicode\|Win32.Build.0 = MinSizeRel\|Win32
	95	+ {D6B50065-7185-4E20-A499-E78276066E6F}.Release Unicode\|x64.ActiveCfg = MinSizeRel\|x64
	96	+ {D6B50065-7185-4E20-A499-E78276066E6F}.Release Unicode\|x64.Build.0 = MinSizeRel\|x64
	97	+ {D6B50065-7185-4E20-A499-E78276066E6F}.Release\|Win32.ActiveCfg = MinSizeRel\|Win32
	98	+ {D6B50065-7185-4E20-A499-E78276066E6F}.Release\|Win32.Build.0 = MinSizeRel\|Win32
	99	+ {D6B50065-7185-4E20-A499-E78276066E6F}.Release\|x64.ActiveCfg = MinSizeRel\|x64
	100	+ {D6B50065-7185-4E20-A499-E78276066E6F}.Release\|x64.Build.0 = MinSizeRel\|x64
	101	+ {D6B50065-7185-4E20-A499-E78276066E6F}.X64 Debug\|Win32.ActiveCfg = X64 Debug\|x64
	102	+ {D6B50065-7185-4E20-A499-E78276066E6F}.X64 Debug\|Win32.Build.0 = X64 Debug\|x64
	103	+ {D6B50065-7185-4E20-A499-E78276066E6F}.X64 Debug\|x64.ActiveCfg = X64 Debug\|x64
	104	+ {D6B50065-7185-4E20-A499-E78276066E6F}.X64 Debug\|x64.Build.0 = X64 Debug\|x64
	105	+ {D6B50065-7185-4E20-A499-E78276066E6F}.X64 Release\|Win32.ActiveCfg = X64 Release\|Win32
	106	+ {D6B50065-7185-4E20-A499-E78276066E6F}.X64 Release\|Win32.Build.0 = X64 Release\|Win32
	107	+ {D6B50065-7185-4E20-A499-E78276066E6F}.X64 Release\|x64.ActiveCfg = X64 Release\|x64
	108	+ {D6B50065-7185-4E20-A499-E78276066E6F}.X64 Release\|x64.Build.0 = X64 Release\|x64
	109	+ {D87729EA-38DF-4025-AA98-22F2438DF995}.Debug Unicode\|Win32.ActiveCfg = Debug\|Win32
	110	+ {D87729EA-38DF-4025-AA98-22F2438DF995}.Debug Unicode\|Win32.Build.0 = Debug\|Win32
	111	+ {D87729EA-38DF-4025-AA98-22F2438DF995}.Debug Unicode\|x64.ActiveCfg = Debug\|x64
	112	+ {D87729EA-38DF-4025-AA98-22F2438DF995}.Debug Unicode\|x64.Build.0 = Debug\|x64
	113	+ {D87729EA-38DF-4025-AA98-22F2438DF995}.Debug\|Win32.ActiveCfg = Debug\|Win32
	114	+ {D87729EA-38DF-4025-AA98-22F2438DF995}.Debug\|Win32.Build.0 = Debug\|Win32
	115	+ {D87729EA-38DF-4025-AA98-22F2438DF995}.Debug\|x64.ActiveCfg = Debug\|x64
	116	+ {D87729EA-38DF-4025-AA98-22F2438DF995}.Debug\|x64.Build.0 = Debug\|x64
	117	+ {D87729EA-38DF-4025-AA98-22F2438DF995}.Release Unicode\|Win32.ActiveCfg = Release\|Win32
	118	+ {D87729EA-38DF-4025-AA98-22F2438DF995}.Release Unicode\|Win32.Build.0 = Release\|Win32
	119	+ {D87729EA-38DF-4025-AA98-22F2438DF995}.Release Unicode\|x64.ActiveCfg = Release\|x64
	120	+ {D87729EA-38DF-4025-AA98-22F2438DF995}.Release Unicode\|x64.Build.0 = Release\|x64
	121	+ {D87729EA-38DF-4025-AA98-22F2438DF995}.Release\|Win32.ActiveCfg = Release\|Win32
	122	+ {D87729EA-38DF-4025-AA98-22F2438DF995}.Release\|Win32.Build.0 = Release\|Win32
	123	+ {D87729EA-38DF-4025-AA98-22F2438DF995}.Release\|x64.ActiveCfg = Release\|x64
	124	+ {D87729EA-38DF-4025-AA98-22F2438DF995}.Release\|x64.Build.0 = Release\|x64
	125	+ {D87729EA-38DF-4025-AA98-22F2438DF995}.X64 Debug\|Win32.ActiveCfg = X64 Debug\|x64
	126	+ {D87729EA-38DF-4025-AA98-22F2438DF995}.X64 Debug\|Win32.Build.0 = X64 Debug\|x64
	127	+ {D87729EA-38DF-4025-AA98-22F2438DF995}.X64 Debug\|x64.ActiveCfg = X64 Debug\|x64
	128	+ {D87729EA-38DF-4025-AA98-22F2438DF995}.X64 Debug\|x64.Build.0 = X64 Debug\|x64
	129	+ {D87729EA-38DF-4025-AA98-22F2438DF995}.X64 Release\|Win32.ActiveCfg = X64 Release\|Win32
	130	+ {D87729EA-38DF-4025-AA98-22F2438DF995}.X64 Release\|Win32.Build.0 = X64 Release\|Win32
	131	+ {D87729EA-38DF-4025-AA98-22F2438DF995}.X64 Release\|x64.ActiveCfg = X64 Release\|x64
	132	+ {D87729EA-38DF-4025-AA98-22F2438DF995}.X64 Release\|x64.Build.0 = X64 Release\|x64
	133	+ {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode\|Win32.ActiveCfg = UnicodeDebug\|Win32
	134	+ {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode\|Win32.Build.0 = UnicodeDebug\|Win32
	135	+ {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode\|x64.ActiveCfg = UnicodeDebug\|x64
	136	+ {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode\|x64.Build.0 = UnicodeDebug\|x64
	137	+ {4B011DDA-2279-437D-903C-8028913AF31B}.Debug\|Win32.ActiveCfg = Debug\|Win32
	138	+ {4B011DDA-2279-437D-903C-8028913AF31B}.Debug\|Win32.Build.0 = Debug\|Win32
	139	+ {4B011DDA-2279-437D-903C-8028913AF31B}.Debug\|x64.ActiveCfg = Debug\|x64
	140	+ {4B011DDA-2279-437D-903C-8028913AF31B}.Debug\|x64.Build.0 = Debug\|x64
	141	+ {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode\|Win32.ActiveCfg = UnicodeRelease\|Win32
	142	+ {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode\|Win32.Build.0 = UnicodeRelease\|Win32
	143	+ {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode\|x64.ActiveCfg = UnicodeRelease\|x64
	144	+ {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode\|x64.Build.0 = UnicodeRelease\|x64
	145	+ {4B011DDA-2279-437D-903C-8028913AF31B}.Release\|Win32.ActiveCfg = Release\|Win32
	146	+ {4B011DDA-2279-437D-903C-8028913AF31B}.Release\|Win32.Build.0 = Release\|Win32
	147	+ {4B011DDA-2279-437D-903C-8028913AF31B}.Release\|x64.ActiveCfg = Release\|x64
	148	+ {4B011DDA-2279-437D-903C-8028913AF31B}.Release\|x64.Build.0 = Release\|x64
	149	+ {4B011DDA-2279-437D-903C-8028913AF31B}.X64 Debug\|Win32.ActiveCfg = X64 Debug\|x64
	150	+ {4B011DDA-2279-437D-903C-8028913AF31B}.X64 Debug\|Win32.Build.0 = X64 Debug\|x64
	151	+ {4B011DDA-2279-437D-903C-8028913AF31B}.X64 Debug\|x64.ActiveCfg = X64 Debug\|x64
	152	+ {4B011DDA-2279-437D-903C-8028913AF31B}.X64 Debug\|x64.Build.0 = X64 Debug\|x64
	153	+ {4B011DDA-2279-437D-903C-8028913AF31B}.X64 Release\|Win32.ActiveCfg = X64 Release\|Win32
	154	+ {4B011DDA-2279-437D-903C-8028913AF31B}.X64 Release\|Win32.Build.0 = X64 Release\|Win32
	155	+ {4B011DDA-2279-437D-903C-8028913AF31B}.X64 Release\|x64.ActiveCfg = X64 Release\|x64
	156	+ {4B011DDA-2279-437D-903C-8028913AF31B}.X64 Release\|x64.Build.0 = X64 Release\|x64
	157	+ {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug Unicode\|Win32.ActiveCfg = UnicodeDebug\|Win32
	158	+ {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug Unicode\|Win32.Build.0 = UnicodeDebug\|Win32
	159	+ {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug Unicode\|x64.ActiveCfg = UnicodeDebug\|x64
	160	+ {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug Unicode\|x64.Build.0 = UnicodeDebug\|x64
	161	+ {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug\|Win32.ActiveCfg = Debug\|Win32
	162	+ {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug\|Win32.Build.0 = Debug\|Win32
	163	+ {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug\|x64.ActiveCfg = Debug\|x64
	164	+ {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug\|x64.Build.0 = Debug\|x64
	165	+ {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release Unicode\|Win32.ActiveCfg = UnicodeRelease\|Win32
	166	+ {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release Unicode\|Win32.Build.0 = UnicodeRelease\|Win32
	167	+ {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release Unicode\|x64.ActiveCfg = UnicodeRelease\|x64
	168	+ {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release Unicode\|x64.Build.0 = UnicodeRelease\|x64
	169	+ {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release\|Win32.ActiveCfg = Release\|Win32
	170	+ {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release\|Win32.Build.0 = Release\|Win32
	171	+ {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release\|x64.ActiveCfg = Release\|x64
	172	+ {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release\|x64.Build.0 = Release\|x64
	173	+ {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Debug\|Win32.ActiveCfg = X64 Debug\|x64
	174	+ {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Debug\|Win32.Build.0 = X64 Debug\|x64
	175	+ {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Debug\|x64.ActiveCfg = X64 Debug\|x64
	176	+ {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Debug\|x64.Build.0 = X64 Debug\|x64
	177	+ {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Release\|Win32.ActiveCfg = X64 Release\|Win32
	178	+ {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Release\|Win32.Build.0 = X64 Release\|Win32
	179	+ {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Release\|x64.ActiveCfg = X64 Release\|x64
	180	+ {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Release\|x64.Build.0 = X64 Release\|x64
	181	+ EndGlobalSection
	182	+ GlobalSection(SolutionProperties) = preSolution
	183	+ HideSolutionNode = FALSE
	184	+ EndGlobalSection
	185	+EndGlobal

Show on old repository browser