Mercurial > pidgin
changeset 21443:420872ab87c0
merge of '4d861866c16a8e87cc915a0d71b0b5a9365cbb3c'
and 'c0c02f799dbd59c8922194529a15e73099f21e84'
author | John Bailey <rekkanoryo@rekkanoryo.org> |
---|---|
date | Mon, 12 Nov 2007 05:46:42 +0000 |
parents | c54720e10706 (current diff) f5b8e7cf870b (diff) |
children | 149f564aa287 |
files | |
diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog.win32 Mon Nov 12 03:09:54 2007 +0000 +++ b/ChangeLog.win32 Mon Nov 12 05:46:42 2007 +0000 @@ -1,5 +1,7 @@ version 2.2.3: - * No changes + * Updated GTK+ to 2.12.1 (This was actually included in 2.2.2, but + didn't get into the Changelog.) + * Upgrade SILC to use the 1.1.2 toolkit version 2.2.2 (10/23/2007): * Updated gtkspell to include a patch to share Aspell dictionaries @@ -11,6 +13,7 @@ * libpurple now looks for a default prefs.xml in the COMMON_APPDATA directory (e.g. \Documents and Settings\All Users\Application Data\purple\prefs.xml) similarly to how this is done on other platforms. + * Updated GTK+ to 2.12.1 version 2.2.1 (09/29/2007): * No changes
--- a/libpurple/win32/global.mak Mon Nov 12 03:09:54 2007 +0000 +++ b/libpurple/win32/global.mak Mon Nov 12 05:46:42 2007 +0000 @@ -20,7 +20,7 @@ NSPR_TOP ?= $(WIN32_DEV_TOP)/nspr-4.6.4 NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.11.4 PERL_LIB_TOP ?= $(WIN32_DEV_TOP)/perl58 -SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1.2 +SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1.5 TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.4.5 GSTREAMER_TOP ?= $(WIN32_DEV_TOP)/gstreamer-0.10.13