summaryrefslogtreecommitdiff
path: root/src/mir_app
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-05-11 21:22:17 +0200
committerGeorge Hazan <ghazan@miranda.im>2018-05-11 21:22:17 +0200
commit3f1628f127d35aa14da97e50c2a94cfd61ad52dd (patch)
treee9f1d8a1282e3c5ee0139003f4aac0e932a99213 /src/mir_app
parent6a6f2b9e3b2749f16b513dfc98d5d5038b5628fb (diff)
merge from master to
fixes #1349 (Miranda crashes on coming back from auto away)
Diffstat (limited to 'src/mir_app')
-rw-r--r--src/mir_app/src/clisttray.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/mir_app/src/clisttray.cpp b/src/mir_app/src/clisttray.cpp
index 658a11fd70..95a48da22d 100644
--- a/src/mir_app/src/clisttray.cpp
+++ b/src/mir_app/src/clisttray.cpp
@@ -27,8 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define TOOLTIP_TOLERANCE 5
-extern HIMAGELIST hCListImages;
-
static UINT WM_TASKBARCREATED;
static UINT WM_TASKBARBUTTONCREATED;
static UINT_PTR RefreshTimerId = 0; /////by FYR