- icqoscar8 moved to deprecated;

- Icq10 is used now as a ICQ protocol;
- solutions updated

3 files changed, 64 insertions, 64 deletions

diff --git a/bin15/mir_full.sln b/bin15/mir_full.sln
index 4bbd5fd282..74a1662fa1 100644
--- a/bin15/mir_full.sln
+++ b/bin15/mir_full.sln
@@ -30,8 +30,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GG", "..\protocols\Gadu-Gad
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IRC", "..\protocols\IRCG\IRC.vcxproj", "{3A12F777-56A8-42EC-BD17-8F325524241E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ICQ", "..\protocols\IcqOscarJ\icqoscar8.vcxproj", "{01DDCB36-4DE2-405D-BC36-2C8BDEB86659}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Jabber", "..\protocols\JabberG\jabber.vcxproj", "{33276462-8313-4192-8306-13717ECCA60A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSN", "..\protocols\MSN\msn.vcxproj", "{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}"
@@ -453,6 +451,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_load", "..\tools\mdbx_
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_sqlite", "..\plugins\Dbx_sqlite\dbx_sqlite.vcxproj", "{B3494FED-FB8C-43F4-B341-F26A3460203B}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ICQ", "..\protocols\Icq10\icq10.vcxproj", "{EFB2355B-82B3-4759-B7D8-95F8E9506291}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -557,14 +557,6 @@ Global
 		{3A12F777-56A8-42EC-BD17-8F325524241E}.Release|Win32.Build.0 = Release|Win32
 		{3A12F777-56A8-42EC-BD17-8F325524241E}.Release|x64.ActiveCfg = Release|x64
 		{3A12F777-56A8-42EC-BD17-8F325524241E}.Release|x64.Build.0 = Release|x64
-		{01DDCB36-4DE2-405D-BC36-2C8BDEB86659}.Debug|Win32.ActiveCfg = Debug|Win32
-		{01DDCB36-4DE2-405D-BC36-2C8BDEB86659}.Debug|Win32.Build.0 = Debug|Win32
-		{01DDCB36-4DE2-405D-BC36-2C8BDEB86659}.Debug|x64.ActiveCfg = Debug|x64
-		{01DDCB36-4DE2-405D-BC36-2C8BDEB86659}.Debug|x64.Build.0 = Debug|x64
-		{01DDCB36-4DE2-405D-BC36-2C8BDEB86659}.Release|Win32.ActiveCfg = Release|Win32
-		{01DDCB36-4DE2-405D-BC36-2C8BDEB86659}.Release|Win32.Build.0 = Release|Win32
-		{01DDCB36-4DE2-405D-BC36-2C8BDEB86659}.Release|x64.ActiveCfg = Release|x64
-		{01DDCB36-4DE2-405D-BC36-2C8BDEB86659}.Release|x64.Build.0 = Release|x64
 		{33276462-8313-4192-8306-13717ECCA60A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{33276462-8313-4192-8306-13717ECCA60A}.Debug|Win32.Build.0 = Debug|Win32
 		{33276462-8313-4192-8306-13717ECCA60A}.Debug|x64.ActiveCfg = Debug|x64
@@ -2035,6 +2027,14 @@ Global
 		{B3494FED-FB8C-43F4-B341-F26A3460203B}.Release|Win32.Build.0 = Release|Win32
 		{B3494FED-FB8C-43F4-B341-F26A3460203B}.Release|x64.ActiveCfg = Release|x64
 		{B3494FED-FB8C-43F4-B341-F26A3460203B}.Release|x64.Build.0 = Release|x64
+		{EFB2355B-82B3-4759-B7D8-95F8E9506291}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EFB2355B-82B3-4759-B7D8-95F8E9506291}.Debug|Win32.Build.0 = Debug|Win32
+		{EFB2355B-82B3-4759-B7D8-95F8E9506291}.Debug|x64.ActiveCfg = Debug|x64
+		{EFB2355B-82B3-4759-B7D8-95F8E9506291}.Debug|x64.Build.0 = Debug|x64
+		{EFB2355B-82B3-4759-B7D8-95F8E9506291}.Release|Win32.ActiveCfg = Release|Win32
+		{EFB2355B-82B3-4759-B7D8-95F8E9506291}.Release|Win32.Build.0 = Release|Win32
+		{EFB2355B-82B3-4759-B7D8-95F8E9506291}.Release|x64.ActiveCfg = Release|x64
+		{EFB2355B-82B3-4759-B7D8-95F8E9506291}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2051,7 +2051,6 @@ Global
 		{99D26CA1-BFD4-4E77-9A1E-919E54CF33F7} = {D8EA3AE1-64AA-42ED-9F13-83F6C7B5AA55}
 		{6DA1396F-2A44-4D5C-8442-012F71006217} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2}
 		{3A12F777-56A8-42EC-BD17-8F325524241E} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2}
-		{01DDCB36-4DE2-405D-BC36-2C8BDEB86659} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2}
 		{33276462-8313-4192-8306-13717ECCA60A} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2}
 		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2}
 		{3C42510C-A29E-4A53-899C-203BFA874E0B} = {F9C41695-3353-4564-A154-58106829B19C}
@@ -2163,6 +2162,7 @@ Global
 		{EE383404-7976-4E87-BD13-A9B7B47C0C10} = {F13387B0-1C74-48EC-9AEC-65E3B9DE29E4}
 		{63BA600E-86BF-4502-9EF0-8C090292E161} = {F13387B0-1C74-48EC-9AEC-65E3B9DE29E4}
 		{B3494FED-FB8C-43F4-B341-F26A3460203B} = {F13387B0-1C74-48EC-9AEC-65E3B9DE29E4}
+		{EFB2355B-82B3-4759-B7D8-95F8E9506291} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {29A0C2A8-07A4-4A8B-8BED-8F7D024013D6}
diff --git a/bin15/mir_icons.sln b/bin15/mir_icons.sln
index 67d445bbd0..74c2feeb3e 100644
--- a/bin15/mir_icons.sln
+++ b/bin15/mir_icons.sln
@@ -18,8 +18,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UInfoEx_icons_ice_Z2", "..\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Facebook", "..\protocols\FacebookRM\proto_facebook\Proto_Facebook.vcxproj", "{44298314-7DD4-4EF7-B576-30E503257223}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_ICQ", "..\protocols\IcqOscarJ\proto_icq\Proto_ICQ.vcxproj", "{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_IRC", "..\protocols\IRCG\proto_irc\Proto_IRC.vcxproj", "{DD667247-3712-4355-9774-7E6ACAF2275E}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Jabber", "..\protocols\JabberG\proto_jabber\Proto_Jabber.vcxproj", "{1AA0A504-0644-4F00-A1AD-F55D69E50DD0}"
@@ -30,8 +28,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_GG", "..\protocols\Ga
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Twitter", "..\protocols\Twitter\proto_twitter\Proto_Twitter.vcxproj", "{A82C682E-8596-4DCA-98A6-50436194714B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_ICQ", "..\protocols\IcqOscarJ\icq_xstatus\xStatus_ICQ.vcxproj", "{E98A8615-1082-1979-D6D8-F763F13BFCBD}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_Jabber", "..\protocols\JabberG\jabber_xstatus\xStatus_Jabber.vcxproj", "{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HistoryPP_icons", "..\plugins\HistoryPlusPlus\historypp_icons\HistoryPP_icons.vcxproj", "{B2E0D5C5-D418-4962-812A-FBC5C7FFC4B6}"
@@ -72,6 +68,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MinecraftDynmap", "..
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Discord", "..\protocols\Discord\proto_discord\Proto_Discord.vcxproj", "{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_ICQ", "..\protocols\Icq10\proto_icq\Proto_ICQ.vcxproj", "{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_ICQ", "..\protocols\Icq10\icq_xstatus\xStatus_ICQ.vcxproj", "{E98A8615-1082-1979-D6D8-F763F13BFCBD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -144,14 +144,6 @@ Global
 		{44298314-7DD4-4EF7-B576-30E503257223}.Release|Win32.Build.0 = Release|Win32
 		{44298314-7DD4-4EF7-B576-30E503257223}.Release|x64.ActiveCfg = Release|x64
 		{44298314-7DD4-4EF7-B576-30E503257223}.Release|x64.Build.0 = Release|x64
-		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|Win32.Build.0 = Debug|Win32
-		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|x64.ActiveCfg = Debug|x64
-		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|x64.Build.0 = Debug|x64
-		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|Win32.ActiveCfg = Release|Win32
-		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|Win32.Build.0 = Release|Win32
-		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|x64.ActiveCfg = Release|x64
-		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|x64.Build.0 = Release|x64
 		{DD667247-3712-4355-9774-7E6ACAF2275E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{DD667247-3712-4355-9774-7E6ACAF2275E}.Debug|Win32.Build.0 = Debug|Win32
 		{DD667247-3712-4355-9774-7E6ACAF2275E}.Debug|x64.ActiveCfg = Debug|x64
@@ -192,14 +184,6 @@ Global
 		{A82C682E-8596-4DCA-98A6-50436194714B}.Release|Win32.Build.0 = Release|Win32
 		{A82C682E-8596-4DCA-98A6-50436194714B}.Release|x64.ActiveCfg = Release|x64
 		{A82C682E-8596-4DCA-98A6-50436194714B}.Release|x64.Build.0 = Release|x64
-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|Win32.Build.0 = Debug|Win32
-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|x64.ActiveCfg = Debug|x64
-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|x64.Build.0 = Debug|x64
-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|Win32.ActiveCfg = Release|Win32
-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|Win32.Build.0 = Release|Win32
-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|x64.ActiveCfg = Release|x64
-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|x64.Build.0 = Release|x64
 		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Debug|Win32.Build.0 = Debug|Win32
 		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Debug|x64.ActiveCfg = Debug|x64
@@ -360,6 +344,22 @@ Global
 		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Release|Win32.Build.0 = Release|Win32
 		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Release|x64.ActiveCfg = Release|x64
 		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Release|x64.Build.0 = Release|x64
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|Win32.Build.0 = Debug|Win32
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|x64.ActiveCfg = Debug|x64
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|x64.Build.0 = Debug|x64
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|Win32.ActiveCfg = Release|Win32
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|Win32.Build.0 = Release|Win32
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|x64.ActiveCfg = Release|x64
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|x64.Build.0 = Release|x64
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|Win32.Build.0 = Debug|Win32
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|x64.ActiveCfg = Debug|x64
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|x64.Build.0 = Debug|x64
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|Win32.ActiveCfg = Release|Win32
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|Win32.Build.0 = Release|Win32
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|x64.ActiveCfg = Release|x64
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/bin15/miranda32.sln b/bin15/miranda32.sln
index 44671a9c78..f4488c5985 100644
--- a/bin15/miranda32.sln
+++ b/bin15/miranda32.sln
@@ -30,24 +30,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GG", "..\protocols\Gadu-Gad
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IRC", "..\protocols\IRCG\IRC.vcxproj", "{3A12F777-56A8-42EC-BD17-8F325524241E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ICQ", "..\protocols\IcqOscarJ\icqoscar8.vcxproj", "{01DDCB36-4DE2-405D-BC36-2C8BDEB86659}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Jabber", "..\protocols\JabberG\jabber.vcxproj", "{33276462-8313-4192-8306-13717ECCA60A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSN", "..\protocols\MSN\msn.vcxproj", "{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_nicer", "..\plugins\clist_nicer\clist_nicer.vcxproj", "{3C42510C-A29E-4A53-899C-203BFA874E0B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_ICQ", "..\protocols\IcqOscarJ\icq_xstatus\xStatus_ICQ.vcxproj", "{E98A8615-1082-1979-D6D8-F763F13BFCBD}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_Jabber", "..\protocols\JabberG\jabber_xstatus\xStatus_Jabber.vcxproj", "{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cln_skinedit", "..\plugins\Cln_skinedit\skinedit.vcxproj", "{987F026D-EB1F-4013-ADA8-2406ACCDA526}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_GG", "..\protocols\Gadu-Gadu\proto_gg\Proto_GG.vcxproj", "{33912E32-3B68-4E2C-82AE-64C06EE987A7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_ICQ", "..\protocols\IcqOscarJ\proto_icq\Proto_ICQ.vcxproj", "{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_IRC", "..\protocols\IRCG\proto_irc\Proto_IRC.vcxproj", "{DD667247-3712-4355-9774-7E6ACAF2275E}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Jabber", "..\protocols\JabberG\proto_jabber\Proto_Jabber.vcxproj", "{1AA0A504-0644-4F00-A1AD-F55D69E50DD0}"
@@ -151,6 +145,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Database", "Database", "{30
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_sqlite", "..\plugins\Dbx_sqlite\dbx_sqlite.vcxproj", "{B3494FED-FB8C-43F4-B341-F26A3460203B}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_ICQ", "..\protocols\Icq10\proto_icq\Proto_ICQ.vcxproj", "{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_ICQ", "..\protocols\Icq10\icq_xstatus\xStatus_ICQ.vcxproj", "{E98A8615-1082-1979-D6D8-F763F13BFCBD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ICQ", "..\protocols\Icq10\icq10.vcxproj", "{EFB2355B-82B3-4759-B7D8-95F8E9506291}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -255,14 +255,6 @@ Global
 		{3A12F777-56A8-42EC-BD17-8F325524241E}.Release|Win32.Build.0 = Release|Win32
 		{3A12F777-56A8-42EC-BD17-8F325524241E}.Release|x64.ActiveCfg = Release|x64
 		{3A12F777-56A8-42EC-BD17-8F325524241E}.Release|x64.Build.0 = Release|x64
-		{01DDCB36-4DE2-405D-BC36-2C8BDEB86659}.Debug|Win32.ActiveCfg = Debug|Win32
-		{01DDCB36-4DE2-405D-BC36-2C8BDEB86659}.Debug|Win32.Build.0 = Debug|Win32
-		{01DDCB36-4DE2-405D-BC36-2C8BDEB86659}.Debug|x64.ActiveCfg = Debug|x64
-		{01DDCB36-4DE2-405D-BC36-2C8BDEB86659}.Debug|x64.Build.0 = Debug|x64
-		{01DDCB36-4DE2-405D-BC36-2C8BDEB86659}.Release|Win32.ActiveCfg = Release|Win32
-		{01DDCB36-4DE2-405D-BC36-2C8BDEB86659}.Release|Win32.Build.0 = Release|Win32
-		{01DDCB36-4DE2-405D-BC36-2C8BDEB86659}.Release|x64.ActiveCfg = Release|x64
-		{01DDCB36-4DE2-405D-BC36-2C8BDEB86659}.Release|x64.Build.0 = Release|x64
 		{33276462-8313-4192-8306-13717ECCA60A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{33276462-8313-4192-8306-13717ECCA60A}.Debug|Win32.Build.0 = Debug|Win32
 		{33276462-8313-4192-8306-13717ECCA60A}.Debug|x64.ActiveCfg = Debug|x64
@@ -287,14 +279,6 @@ Global
 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Release|Win32.Build.0 = Release|Win32
 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Release|x64.ActiveCfg = Release|x64
 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Release|x64.Build.0 = Release|x64
-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|Win32.Build.0 = Debug|Win32
-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|x64.ActiveCfg = Debug|x64
-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|x64.Build.0 = Debug|x64
-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|Win32.ActiveCfg = Release|Win32
-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|Win32.Build.0 = Release|Win32
-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|x64.ActiveCfg = Release|x64
-		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|x64.Build.0 = Release|x64
 		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Debug|Win32.Build.0 = Debug|Win32
 		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Debug|x64.ActiveCfg = Debug|x64
@@ -319,14 +303,6 @@ Global
 		{33912E32-3B68-4E2C-82AE-64C06EE987A7}.Release|Win32.Build.0 = Release|Win32
 		{33912E32-3B68-4E2C-82AE-64C06EE987A7}.Release|x64.ActiveCfg = Release|x64
 		{33912E32-3B68-4E2C-82AE-64C06EE987A7}.Release|x64.Build.0 = Release|x64
-		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|Win32.Build.0 = Debug|Win32
-		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|x64.ActiveCfg = Debug|x64
-		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|x64.Build.0 = Debug|x64
-		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|Win32.ActiveCfg = Release|Win32
-		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|Win32.Build.0 = Release|Win32
-		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|x64.ActiveCfg = Release|x64
-		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|x64.Build.0 = Release|x64
 		{DD667247-3712-4355-9774-7E6ACAF2275E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{DD667247-3712-4355-9774-7E6ACAF2275E}.Debug|Win32.Build.0 = Debug|Win32
 		{DD667247-3712-4355-9774-7E6ACAF2275E}.Debug|x64.ActiveCfg = Debug|x64
@@ -559,6 +535,30 @@ Global
 		{B3494FED-FB8C-43F4-B341-F26A3460203B}.Release|Win32.Build.0 = Release|Win32
 		{B3494FED-FB8C-43F4-B341-F26A3460203B}.Release|x64.ActiveCfg = Release|x64
 		{B3494FED-FB8C-43F4-B341-F26A3460203B}.Release|x64.Build.0 = Release|x64
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|Win32.Build.0 = Debug|Win32
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|x64.ActiveCfg = Debug|x64
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Debug|x64.Build.0 = Debug|x64
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|Win32.ActiveCfg = Release|Win32
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|Win32.Build.0 = Release|Win32
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|x64.ActiveCfg = Release|x64
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|x64.Build.0 = Release|x64
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|Win32.Build.0 = Debug|Win32
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|x64.ActiveCfg = Debug|x64
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|x64.Build.0 = Debug|x64
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|Win32.ActiveCfg = Release|Win32
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|Win32.Build.0 = Release|Win32
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|x64.ActiveCfg = Release|x64
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|x64.Build.0 = Release|x64
+		{EFB2355B-82B3-4759-B7D8-95F8E9506291}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EFB2355B-82B3-4759-B7D8-95F8E9506291}.Debug|Win32.Build.0 = Debug|Win32
+		{EFB2355B-82B3-4759-B7D8-95F8E9506291}.Debug|x64.ActiveCfg = Debug|x64
+		{EFB2355B-82B3-4759-B7D8-95F8E9506291}.Debug|x64.Build.0 = Debug|x64
+		{EFB2355B-82B3-4759-B7D8-95F8E9506291}.Release|Win32.ActiveCfg = Release|Win32
+		{EFB2355B-82B3-4759-B7D8-95F8E9506291}.Release|Win32.Build.0 = Release|Win32
+		{EFB2355B-82B3-4759-B7D8-95F8E9506291}.Release|x64.ActiveCfg = Release|x64
+		{EFB2355B-82B3-4759-B7D8-95F8E9506291}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -575,15 +575,12 @@ Global
 		{99D26CA1-BFD4-4E77-9A1E-919E54CF33F7} = {6221EF9E-F53A-4381-B760-4C0208E5D597}
 		{6DA1396F-2A44-4D5C-8442-012F71006217} = {812EF24D-9B76-4A94-ABE0-6F80C381C203}
 		{3A12F777-56A8-42EC-BD17-8F325524241E} = {812EF24D-9B76-4A94-ABE0-6F80C381C203}
-		{01DDCB36-4DE2-405D-BC36-2C8BDEB86659} = {812EF24D-9B76-4A94-ABE0-6F80C381C203}
 		{33276462-8313-4192-8306-13717ECCA60A} = {812EF24D-9B76-4A94-ABE0-6F80C381C203}
 		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D} = {812EF24D-9B76-4A94-ABE0-6F80C381C203}
 		{3C42510C-A29E-4A53-899C-203BFA874E0B} = {6221EF9E-F53A-4381-B760-4C0208E5D597}
-		{E98A8615-1082-1979-D6D8-F763F13BFCBD} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
 		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
 		{987F026D-EB1F-4013-ADA8-2406ACCDA526} = {6221EF9E-F53A-4381-B760-4C0208E5D597}
 		{33912E32-3B68-4E2C-82AE-64C06EE987A7} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
-		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
 		{DD667247-3712-4355-9774-7E6ACAF2275E} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
 		{1AA0A504-0644-4F00-A1AD-F55D69E50DD0} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
 		{7BC6C3E7-2B17-4718-A82E-084798710E14} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
@@ -613,6 +610,9 @@ Global
 		{EE383404-7976-4E87-BD13-A9B7B47C0C10} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52}
 		{63BA600E-86BF-4502-9EF0-8C090292E161} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52}
 		{B3494FED-FB8C-43F4-B341-F26A3460203B} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52}
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
+		{EFB2355B-82B3-4759-B7D8-95F8E9506291} = {812EF24D-9B76-4A94-ABE0-6F80C381C203}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5A4CD630-DD83-4096-AA4D-7A141E43E853}