diff options
| author | Tobias Weimer <wishmaster51@googlemail.com> | 2015-01-09 19:38:12 +0000 |
|---|---|---|
| committer | Tobias Weimer <wishmaster51@googlemail.com> | 2015-01-09 19:38:12 +0000 |
| commit | 8e2a004d967dd3faea172fbed655b0b45c826d54 (patch) | |
| tree | d9927aa8060439235584bd0b4bbd27df86c577fe /protocols/SkypeClassic/src/resource.h | |
| parent | 7feae2a81f7c4784805329e1d1c1682e689a4008 (diff) | |
SkypeClassic:
Upmerge with leecher's repo:
-Implemented Filetransfer extensions for receiving files and avatars via SkypeProxy (sending via SkypeProxy not working yet).
-Added option to disable the check for SENT messages as newer Skype versions don't send this notification anymore.
-Various little code fixes.
Other changes:
- Fixed memory leak
- Fixed crash in x64 builds
- Translation fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@11805 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/SkypeClassic/src/resource.h')
| -rw-r--r-- | protocols/SkypeClassic/src/resource.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/protocols/SkypeClassic/src/resource.h b/protocols/SkypeClassic/src/resource.h index 427289efde..d80e5ce87c 100644 --- a/protocols/SkypeClassic/src/resource.h +++ b/protocols/SkypeClassic/src/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by Skript1.rc
+// Microsoft Visual C++ generated include file.
+// Used by ..\res\Resource.rc
//
#define IDI_SKYPE 102
#define IDI_ONLINE 104
@@ -112,6 +112,7 @@ #define IDC_STATIC_POPUPBACKCOLORERR 1069
#define IDC_STATIC_PATHINFO 1070
#define IDC_STATIC_RESTART 1071
+#define IDC_NOACK 1072
// Next default values for new objects
//
@@ -119,7 +120,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 183
#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1072
+#define _APS_NEXT_CONTROL_VALUE 1073
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
|