pidgin/win32/resource.h@2d76d38118a8
pidgin/win32/resource.h
Thu, 23 Jan 2014 23:38:47 -0800
- author
- Mark Doliner <mark@kingant.net>
- date
- Thu, 23 Jan 2014 23:38:47 -0800
- changeset 35297
- 2d76d38118a8
- parent 16808
- c0736ad72fd6
- child 18068
- b6554e3c8224
- permissions
- -rw-r--r--
Merge release-2.x.y branch into main, with manual merges in
ChangeLog (easy)
Makefile.mingw (easy)
configure.ac (easy)
irc/msgs.c (not too bad)
And some Windows build files. We should make sure the pango used by 3.0.0
doesn't have the crash bug from CVE-2013-6486.
#define PIDGIN_ICON 104 #define PIDGIN_TRAY_AVAILABLE_4BIT 105 #define PIDGIN_TRAY_AWAY_4BIT 106 #define PIDGIN_TRAY_BUSY_4BIT 107 #define PIDGIN_TRAY_XA_4BIT 108 #define PIDGIN_TRAY_OFFLINE_4BIT 109 #define PIDGIN_TRAY_CONNECTING_4BIT 110 #define PIDGIN_TRAY_PENDING_4BIT 111 #define PIDGIN_TRAY_INVISIBLE_4BIT 112
