summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bin10/mir_full.sln10
-rw-r--r--bin10/mir_full_pro.sln11
-rw-r--r--bin12/mir_full.sln10
-rw-r--r--plugins/!Deprecated/FlashAvatars/FlashAvatars_10.vcxproj (renamed from plugins/FlashAvatars/FlashAvatars_10.vcxproj)0
-rw-r--r--plugins/!Deprecated/FlashAvatars/FlashAvatars_10.vcxproj.filters (renamed from plugins/FlashAvatars/FlashAvatars_10.vcxproj.filters)0
-rw-r--r--plugins/!Deprecated/FlashAvatars/FlashAvatars_12.vcxproj (renamed from plugins/FlashAvatars/FlashAvatars_12.vcxproj)0
-rw-r--r--plugins/!Deprecated/FlashAvatars/FlashAvatars_12.vcxproj.filters (renamed from plugins/FlashAvatars/FlashAvatars_12.vcxproj.filters)0
-rw-r--r--plugins/!Deprecated/FlashAvatars/docs/changelog.txt (renamed from plugins/FlashAvatars/docs/changelog.txt)0
-rw-r--r--plugins/!Deprecated/FlashAvatars/res/FlashAvatars.rc (renamed from plugins/FlashAvatars/res/FlashAvatars.rc)0
-rw-r--r--plugins/!Deprecated/FlashAvatars/res/Version.rc (renamed from plugins/FlashAvatars/res/Version.rc)0
-rw-r--r--plugins/!Deprecated/FlashAvatars/src/TigerHash.cpp (renamed from plugins/FlashAvatars/src/TigerHash.cpp)0
-rw-r--r--plugins/!Deprecated/FlashAvatars/src/TigerHash.h (renamed from plugins/FlashAvatars/src/TigerHash.h)0
-rw-r--r--plugins/!Deprecated/FlashAvatars/src/Version.h (renamed from plugins/FlashAvatars/src/Version.h)0
-rw-r--r--plugins/!Deprecated/FlashAvatars/src/cflash.cpp (renamed from plugins/FlashAvatars/src/cflash.cpp)0
-rw-r--r--plugins/!Deprecated/FlashAvatars/src/criticalsection.h (renamed from plugins/FlashAvatars/src/criticalsection.h)0
-rw-r--r--plugins/!Deprecated/FlashAvatars/src/flash.tlb (renamed from plugins/FlashAvatars/src/flash.tlb)bin14160 -> 14160 bytes
-rw-r--r--plugins/!Deprecated/FlashAvatars/src/resource.h (renamed from plugins/FlashAvatars/src/resource.h)0
-rw-r--r--plugins/!Deprecated/FlashAvatars/src/stdafx.cpp (renamed from plugins/FlashAvatars/src/stdafx.cpp)0
-rw-r--r--plugins/!Deprecated/FlashAvatars/src/stdafx.h (renamed from plugins/FlashAvatars/src/stdafx.h)0
-rw-r--r--plugins/PluginUpdater/src/DlgUpdate.cpp1
20 files changed, 1 insertions, 31 deletions
diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index 949dd2c0ac..67b3745bdc 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -61,8 +61,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FavContacts", "..\plugins\F
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FirstRun", "..\plugins\FirstRun\FirstRun_10.vcxproj", "{2CBA4321-8FA3-4385-BAB6-5387668FBBC4}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FlashAvatars", "..\plugins\FlashAvatars\FlashAvatars_10.vcxproj", "{914B61B9-3383-4FA1-9BA9-350200B734B5}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FltContacts", "..\plugins\FloatingContacts\FltCont_10.vcxproj", "{9290A9CC-3FDA-4FD6-A8A2-04AD4BA1C856}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folders", "..\plugins\Folders\folders_10.vcxproj", "{019FAEBD-BD7B-4470-A15B-A7DB1787E6BD}"
@@ -654,14 +652,6 @@ Global
{2CBA4321-8FA3-4385-BAB6-5387668FBBC4}.Release|Win32.Build.0 = Release|Win32
{2CBA4321-8FA3-4385-BAB6-5387668FBBC4}.Release|x64.ActiveCfg = Release|x64
{2CBA4321-8FA3-4385-BAB6-5387668FBBC4}.Release|x64.Build.0 = Release|x64
- {914B61B9-3383-4FA1-9BA9-350200B734B5}.Debug|Win32.ActiveCfg = Debug|Win32
- {914B61B9-3383-4FA1-9BA9-350200B734B5}.Debug|Win32.Build.0 = Debug|Win32
- {914B61B9-3383-4FA1-9BA9-350200B734B5}.Debug|x64.ActiveCfg = Debug|x64
- {914B61B9-3383-4FA1-9BA9-350200B734B5}.Debug|x64.Build.0 = Debug|x64
- {914B61B9-3383-4FA1-9BA9-350200B734B5}.Release|Win32.ActiveCfg = Release|Win32
- {914B61B9-3383-4FA1-9BA9-350200B734B5}.Release|Win32.Build.0 = Release|Win32
- {914B61B9-3383-4FA1-9BA9-350200B734B5}.Release|x64.ActiveCfg = Release|x64
- {914B61B9-3383-4FA1-9BA9-350200B734B5}.Release|x64.Build.0 = Release|x64
{9290A9CC-3FDA-4FD6-A8A2-04AD4BA1C856}.Debug|Win32.ActiveCfg = Debug|Win32
{9290A9CC-3FDA-4FD6-A8A2-04AD4BA1C856}.Debug|Win32.Build.0 = Debug|Win32
{9290A9CC-3FDA-4FD6-A8A2-04AD4BA1C856}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln
index c724b44591..a5d2b44c0d 100644
--- a/bin10/mir_full_pro.sln
+++ b/bin10/mir_full_pro.sln
@@ -61,8 +61,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FavContacts", "..\plugins\F
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FirstRun", "..\plugins\FirstRun\FirstRun_10.vcxproj", "{2CBA4321-8FA3-4385-BAB6-5387668FBBC4}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FlashAvatars", "..\plugins\FlashAvatars\FlashAvatars_10.vcxproj", "{914B61B9-3383-4FA1-9BA9-350200B734B5}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FltContacts", "..\plugins\FloatingContacts\FltCont_10.vcxproj", "{9290A9CC-3FDA-4FD6-A8A2-04AD4BA1C856}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folders", "..\plugins\Folders\folders_10.vcxproj", "{019FAEBD-BD7B-4470-A15B-A7DB1787E6BD}"
@@ -686,14 +684,6 @@ Global
{2CBA4321-8FA3-4385-BAB6-5387668FBBC4}.Release|Win32.Build.0 = Release|Win32
{2CBA4321-8FA3-4385-BAB6-5387668FBBC4}.Release|x64.ActiveCfg = Release|x64
{2CBA4321-8FA3-4385-BAB6-5387668FBBC4}.Release|x64.Build.0 = Release|x64
- {914B61B9-3383-4FA1-9BA9-350200B734B5}.Debug|Win32.ActiveCfg = Debug|Win32
- {914B61B9-3383-4FA1-9BA9-350200B734B5}.Debug|Win32.Build.0 = Debug|Win32
- {914B61B9-3383-4FA1-9BA9-350200B734B5}.Debug|x64.ActiveCfg = Debug|x64
- {914B61B9-3383-4FA1-9BA9-350200B734B5}.Debug|x64.Build.0 = Debug|x64
- {914B61B9-3383-4FA1-9BA9-350200B734B5}.Release|Win32.ActiveCfg = Release|Win32
- {914B61B9-3383-4FA1-9BA9-350200B734B5}.Release|Win32.Build.0 = Release|Win32
- {914B61B9-3383-4FA1-9BA9-350200B734B5}.Release|x64.ActiveCfg = Release|x64
- {914B61B9-3383-4FA1-9BA9-350200B734B5}.Release|x64.Build.0 = Release|x64
{9290A9CC-3FDA-4FD6-A8A2-04AD4BA1C856}.Debug|Win32.ActiveCfg = Debug|Win32
{9290A9CC-3FDA-4FD6-A8A2-04AD4BA1C856}.Debug|Win32.Build.0 = Debug|Win32
{9290A9CC-3FDA-4FD6-A8A2-04AD4BA1C856}.Debug|x64.ActiveCfg = Debug|x64
@@ -1896,7 +1886,6 @@ Global
{A231E008-2D1A-4F24-95DD-59F56F85A499} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}
{B4361FA0-4073-4B60-EE72-F5C08E6EDF61} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}
{2CBA4321-8FA3-4385-BAB6-5387668FBBC4} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}
- {914B61B9-3383-4FA1-9BA9-350200B734B5} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}
{019FAEBD-BD7B-4470-A15B-A7DB1787E6BD} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}
{8190CFAA-3B73-43D8-9101-8368E21F1864} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}
{5A6095F4-B037-4DA8-8410-8004A90C961A} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}
diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln
index 64849be7c7..e71d46f5b9 100644
--- a/bin12/mir_full.sln
+++ b/bin12/mir_full.sln
@@ -63,8 +63,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FavContacts", "..\plugins\F
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FirstRun", "..\plugins\FirstRun\FirstRun_12.vcxproj", "{2CBA4321-8FA3-4385-BAB6-5387668FBBC4}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FlashAvatars", "..\plugins\FlashAvatars\FlashAvatars_12.vcxproj", "{914B61B9-3383-4FA1-9BA9-350200B734B5}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FltContacts", "..\plugins\FloatingContacts\FltCont_12.vcxproj", "{9290A9CC-3FDA-4FD6-A8A2-04AD4BA1C856}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folders", "..\plugins\Folders\folders_12.vcxproj", "{019FAEBD-BD7B-4470-A15B-A7DB1787E6BD}"
@@ -656,14 +654,6 @@ Global
{2CBA4321-8FA3-4385-BAB6-5387668FBBC4}.Release|Win32.Build.0 = Release|Win32
{2CBA4321-8FA3-4385-BAB6-5387668FBBC4}.Release|x64.ActiveCfg = Release|x64
{2CBA4321-8FA3-4385-BAB6-5387668FBBC4}.Release|x64.Build.0 = Release|x64
- {914B61B9-3383-4FA1-9BA9-350200B734B5}.Debug|Win32.ActiveCfg = Debug|Win32
- {914B61B9-3383-4FA1-9BA9-350200B734B5}.Debug|Win32.Build.0 = Debug|Win32
- {914B61B9-3383-4FA1-9BA9-350200B734B5}.Debug|x64.ActiveCfg = Debug|x64
- {914B61B9-3383-4FA1-9BA9-350200B734B5}.Debug|x64.Build.0 = Debug|x64
- {914B61B9-3383-4FA1-9BA9-350200B734B5}.Release|Win32.ActiveCfg = Release|Win32
- {914B61B9-3383-4FA1-9BA9-350200B734B5}.Release|Win32.Build.0 = Release|Win32
- {914B61B9-3383-4FA1-9BA9-350200B734B5}.Release|x64.ActiveCfg = Release|x64
- {914B61B9-3383-4FA1-9BA9-350200B734B5}.Release|x64.Build.0 = Release|x64
{9290A9CC-3FDA-4FD6-A8A2-04AD4BA1C856}.Debug|Win32.ActiveCfg = Debug|Win32
{9290A9CC-3FDA-4FD6-A8A2-04AD4BA1C856}.Debug|Win32.Build.0 = Debug|Win32
{9290A9CC-3FDA-4FD6-A8A2-04AD4BA1C856}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/plugins/FlashAvatars/FlashAvatars_10.vcxproj b/plugins/!Deprecated/FlashAvatars/FlashAvatars_10.vcxproj
index bbbee617ed..bbbee617ed 100644
--- a/plugins/FlashAvatars/FlashAvatars_10.vcxproj
+++ b/plugins/!Deprecated/FlashAvatars/FlashAvatars_10.vcxproj
diff --git a/plugins/FlashAvatars/FlashAvatars_10.vcxproj.filters b/plugins/!Deprecated/FlashAvatars/FlashAvatars_10.vcxproj.filters
index 84595578e0..84595578e0 100644
--- a/plugins/FlashAvatars/FlashAvatars_10.vcxproj.filters
+++ b/plugins/!Deprecated/FlashAvatars/FlashAvatars_10.vcxproj.filters
diff --git a/plugins/FlashAvatars/FlashAvatars_12.vcxproj b/plugins/!Deprecated/FlashAvatars/FlashAvatars_12.vcxproj
index 534445879e..534445879e 100644
--- a/plugins/FlashAvatars/FlashAvatars_12.vcxproj
+++ b/plugins/!Deprecated/FlashAvatars/FlashAvatars_12.vcxproj
diff --git a/plugins/FlashAvatars/FlashAvatars_12.vcxproj.filters b/plugins/!Deprecated/FlashAvatars/FlashAvatars_12.vcxproj.filters
index 84595578e0..84595578e0 100644
--- a/plugins/FlashAvatars/FlashAvatars_12.vcxproj.filters
+++ b/plugins/!Deprecated/FlashAvatars/FlashAvatars_12.vcxproj.filters
diff --git a/plugins/FlashAvatars/docs/changelog.txt b/plugins/!Deprecated/FlashAvatars/docs/changelog.txt
index 79a9b5a972..79a9b5a972 100644
--- a/plugins/FlashAvatars/docs/changelog.txt
+++ b/plugins/!Deprecated/FlashAvatars/docs/changelog.txt
diff --git a/plugins/FlashAvatars/res/FlashAvatars.rc b/plugins/!Deprecated/FlashAvatars/res/FlashAvatars.rc
index 2282ceecf7..2282ceecf7 100644
--- a/plugins/FlashAvatars/res/FlashAvatars.rc
+++ b/plugins/!Deprecated/FlashAvatars/res/FlashAvatars.rc
diff --git a/plugins/FlashAvatars/res/Version.rc b/plugins/!Deprecated/FlashAvatars/res/Version.rc
index 5bfbab4754..5bfbab4754 100644
--- a/plugins/FlashAvatars/res/Version.rc
+++ b/plugins/!Deprecated/FlashAvatars/res/Version.rc
diff --git a/plugins/FlashAvatars/src/TigerHash.cpp b/plugins/!Deprecated/FlashAvatars/src/TigerHash.cpp
index 094ba444ed..094ba444ed 100644
--- a/plugins/FlashAvatars/src/TigerHash.cpp
+++ b/plugins/!Deprecated/FlashAvatars/src/TigerHash.cpp
diff --git a/plugins/FlashAvatars/src/TigerHash.h b/plugins/!Deprecated/FlashAvatars/src/TigerHash.h
index b738fb97b7..b738fb97b7 100644
--- a/plugins/FlashAvatars/src/TigerHash.h
+++ b/plugins/!Deprecated/FlashAvatars/src/TigerHash.h
diff --git a/plugins/FlashAvatars/src/Version.h b/plugins/!Deprecated/FlashAvatars/src/Version.h
index 7ab5bbae86..7ab5bbae86 100644
--- a/plugins/FlashAvatars/src/Version.h
+++ b/plugins/!Deprecated/FlashAvatars/src/Version.h
diff --git a/plugins/FlashAvatars/src/cflash.cpp b/plugins/!Deprecated/FlashAvatars/src/cflash.cpp
index 134b896758..134b896758 100644
--- a/plugins/FlashAvatars/src/cflash.cpp
+++ b/plugins/!Deprecated/FlashAvatars/src/cflash.cpp
diff --git a/plugins/FlashAvatars/src/criticalsection.h b/plugins/!Deprecated/FlashAvatars/src/criticalsection.h
index 7c9bcdaa9a..7c9bcdaa9a 100644
--- a/plugins/FlashAvatars/src/criticalsection.h
+++ b/plugins/!Deprecated/FlashAvatars/src/criticalsection.h
diff --git a/plugins/FlashAvatars/src/flash.tlb b/plugins/!Deprecated/FlashAvatars/src/flash.tlb
index 489608c08b..489608c08b 100644
--- a/plugins/FlashAvatars/src/flash.tlb
+++ b/plugins/!Deprecated/FlashAvatars/src/flash.tlb
Binary files differ
diff --git a/plugins/FlashAvatars/src/resource.h b/plugins/!Deprecated/FlashAvatars/src/resource.h
index cbedd28229..cbedd28229 100644
--- a/plugins/FlashAvatars/src/resource.h
+++ b/plugins/!Deprecated/FlashAvatars/src/resource.h
diff --git a/plugins/FlashAvatars/src/stdafx.cpp b/plugins/!Deprecated/FlashAvatars/src/stdafx.cpp
index a70d8726c6..a70d8726c6 100644
--- a/plugins/FlashAvatars/src/stdafx.cpp
+++ b/plugins/!Deprecated/FlashAvatars/src/stdafx.cpp
diff --git a/plugins/FlashAvatars/src/stdafx.h b/plugins/!Deprecated/FlashAvatars/src/stdafx.h
index f571759135..f571759135 100644
--- a/plugins/FlashAvatars/src/stdafx.h
+++ b/plugins/!Deprecated/FlashAvatars/src/stdafx.h
diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp
index 879f9c0343..3a9c6129bf 100644
--- a/plugins/PluginUpdater/src/DlgUpdate.cpp
+++ b/plugins/PluginUpdater/src/DlgUpdate.cpp
@@ -534,6 +534,7 @@ static renameTable[] =
{ _T("gender.dll"), NULL },
{ _T("srmm.dll"), NULL },
{ _T("extraicons.dll"), NULL },
+ { _T("flashavatars.dll"), NULL },
{ _T("langman.dll"), NULL },
{ _T("metacontacts.dll"), NULL },
};