summaryrefslogtreecommitdiff
path: root/bin10
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2013-11-04 08:59:15 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2013-11-04 08:59:15 +0000
commitc77821d0b4b3ae09e47ce6d6ca9d6b21dbb56d30 (patch)
tree4063ea096104679033e757b724b22da17534da21 /bin10
parent9d51dbf389539696b5d5e3417683c1709d957b6b (diff)
LCDFramework project removed, integrated to MirandaG15 project
git-svn-id: http://svn.miranda-ng.org/main/trunk@6767 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'bin10')
-rw-r--r--bin10/mir_full.sln10
-rw-r--r--bin10/mir_full_pro.sln18
2 files changed, 2 insertions, 26 deletions
diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index 7cd0524d35..147539adc2 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -415,8 +415,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartupSilence", "..\plugin
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SkypeClassic", "..\protocols\SkypeClassic\SkypeClassic_10.vcxproj", "{5F9243AE-C6C9-4F42-B670-67A97767A50B}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LCDFramework", "..\plugins\MirandaG15\LCDFramework\LCDFramework_10.vcxproj", "{3BBA4976-826E-44E5-B65F-8A2E1D912BE7}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirandaG15", "..\plugins\MirandaG15\MirandaG15_10.vcxproj", "{8ACA3C8B-BDFA-47B2-8578-069555BA05B3}"
EndProject
Global
@@ -1867,14 +1865,6 @@ Global
{5F9243AE-C6C9-4F42-B670-67A97767A50B}.Release|Win32.Build.0 = Release|Win32
{5F9243AE-C6C9-4F42-B670-67A97767A50B}.Release|x64.ActiveCfg = Release|x64
{5F9243AE-C6C9-4F42-B670-67A97767A50B}.Release|x64.Build.0 = Release|x64
- {3BBA4976-826E-44E5-B65F-8A2E1D912BE7}.Debug|Win32.ActiveCfg = Debug|Win32
- {3BBA4976-826E-44E5-B65F-8A2E1D912BE7}.Debug|Win32.Build.0 = Debug|Win32
- {3BBA4976-826E-44E5-B65F-8A2E1D912BE7}.Debug|x64.ActiveCfg = Debug|x64
- {3BBA4976-826E-44E5-B65F-8A2E1D912BE7}.Debug|x64.Build.0 = Debug|x64
- {3BBA4976-826E-44E5-B65F-8A2E1D912BE7}.Release|Win32.ActiveCfg = Release|Win32
- {3BBA4976-826E-44E5-B65F-8A2E1D912BE7}.Release|Win32.Build.0 = Release|Win32
- {3BBA4976-826E-44E5-B65F-8A2E1D912BE7}.Release|x64.ActiveCfg = Release|x64
- {3BBA4976-826E-44E5-B65F-8A2E1D912BE7}.Release|x64.Build.0 = Release|x64
{8ACA3C8B-BDFA-47B2-8578-069555BA05B3}.Debug|Win32.ActiveCfg = Debug|Win32
{8ACA3C8B-BDFA-47B2-8578-069555BA05B3}.Debug|Win32.Build.0 = Debug|Win32
{8ACA3C8B-BDFA-47B2-8578-069555BA05B3}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln
index 508c668ed4..2785cfb76d 100644
--- a/bin10/mir_full_pro.sln
+++ b/bin10/mir_full_pro.sln
@@ -451,11 +451,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartupSilence", "..\plugin
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SkypeClassic", "..\protocols\SkypeClassic\SkypeClassic_10.vcxproj", "{5F9243AE-C6C9-4F42-B670-67A97767A50B}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MirandaG15", "MirandaG15", "{36379FCA-AE7B-4273-85FE-A68E8A274BCB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LCDFramework", "..\plugins\MirandaG15\LCDFramework\LCDFramework.vcxproj", "{3BBA4976-826E-44E5-B65F-8A2E1D912BE7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirandaG15", "..\plugins\MirandaG15\MirandaG15.vcxproj", "{8ACA3C8B-BDFA-47B2-8578-069555BA05B3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirandaG15", "..\plugins\MirandaG15\MirandaG15_10.vcxproj", "{8ACA3C8B-BDFA-47B2-8578-069555BA05B3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -1905,14 +1901,6 @@ Global
{5F9243AE-C6C9-4F42-B670-67A97767A50B}.Release|Win32.Build.0 = Release|Win32
{5F9243AE-C6C9-4F42-B670-67A97767A50B}.Release|x64.ActiveCfg = Release|x64
{5F9243AE-C6C9-4F42-B670-67A97767A50B}.Release|x64.Build.0 = Release|x64
- {3BBA4976-826E-44E5-B65F-8A2E1D912BE7}.Debug|Win32.ActiveCfg = Debug|Win32
- {3BBA4976-826E-44E5-B65F-8A2E1D912BE7}.Debug|Win32.Build.0 = Debug|Win32
- {3BBA4976-826E-44E5-B65F-8A2E1D912BE7}.Debug|x64.ActiveCfg = Debug|x64
- {3BBA4976-826E-44E5-B65F-8A2E1D912BE7}.Debug|x64.Build.0 = Debug|x64
- {3BBA4976-826E-44E5-B65F-8A2E1D912BE7}.Release|Win32.ActiveCfg = Release|Win32
- {3BBA4976-826E-44E5-B65F-8A2E1D912BE7}.Release|Win32.Build.0 = Release|Win32
- {3BBA4976-826E-44E5-B65F-8A2E1D912BE7}.Release|x64.ActiveCfg = Release|x64
- {3BBA4976-826E-44E5-B65F-8A2E1D912BE7}.Release|x64.Build.0 = Release|x64
{8ACA3C8B-BDFA-47B2-8578-069555BA05B3}.Debug|Win32.ActiveCfg = Debug|Win32
{8ACA3C8B-BDFA-47B2-8578-069555BA05B3}.Debug|Win32.Build.0 = Debug|Win32
{8ACA3C8B-BDFA-47B2-8578-069555BA05B3}.Debug|x64.ActiveCfg = Debug|x64
@@ -2081,7 +2069,7 @@ Global
{F462FDA1-BDCD-49B2-B996-D7DE71D07393} = {99B819F8-65D9-45BC-B0C4-8C2B0F63AD46}
{A44F96D0-A850-4A67-9570-0E9298A16E40} = {99B819F8-65D9-45BC-B0C4-8C2B0F63AD46}
{7B072B7F-E2AA-4935-AAF5-5BEF99665AD3} = {99B819F8-65D9-45BC-B0C4-8C2B0F63AD46}
- {36379FCA-AE7B-4273-85FE-A68E8A274BCB} = {99B819F8-65D9-45BC-B0C4-8C2B0F63AD46}
+ {8ACA3C8B-BDFA-47B2-8578-069555BA05B3} = {99B819F8-65D9-45BC-B0C4-8C2B0F63AD46}
{66503A70-B1E8-4545-B4FF-2108DFB40C72} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}
{D548A54E-310B-4A86-A545-64BDD5748745} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}
{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}
@@ -2113,8 +2101,6 @@ Global
{2C050CAF-D8AA-468A-B1A7-89F3BE99D3C8} = {3E727941-2854-4F64-ADA5-BF3BF104A4A3}
{73BA9CA5-640D-4F30-A157-A73557A25F98} = {129AC608-06B4-419C-8FEA-7DF5D90CE9D6}
{1E3BB48A-FFBC-4A03-8C43-9124A484BE51} = {129AC608-06B4-419C-8FEA-7DF5D90CE9D6}
- {3BBA4976-826E-44E5-B65F-8A2E1D912BE7} = {36379FCA-AE7B-4273-85FE-A68E8A274BCB}
- {8ACA3C8B-BDFA-47B2-8578-069555BA05B3} = {36379FCA-AE7B-4273-85FE-A68E8A274BCB}
EndGlobalSection
GlobalSection(DPCodeReviewSolutionGUID) = preSolution
DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}