Mercurial > pidgin

changeset 19407:41417f94afe9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '8d675a1883a0f1c7f3c08d9b12242cd3fc7bcaf9' and 'b1a0340ea0f3e2adf428695c63bf6f5c526b375f'
author Sean Egan <seanegan@gmail.com>
date Fri, 24 Aug 2007 15:58:46 +0000
parents 215c02a8ff88 (diff) fbdabdd3839a (current diff)
children cc36a5aac908 3650db1f02d3
files
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Aug 24 15:58:38 2007 +0000
+++ b/ChangeLog	Fri Aug 24 15:58:46 2007 +0000
@@ -1,5 +1,9 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.1.2:
+	* New protocol plugin: MySpaceIM (Jeff Connelly, Google Summer of
+	  Code)
+
 version 2.1.1 (08/20/2007):
 	Yahoo:
 	* Added an account action to open your inbox in the yahoo prpl.
--- a/libpurple/Makefile.am	Fri Aug 24 15:58:38 2007 +0000
+++ b/libpurple/Makefile.am	Fri Aug 24 15:58:46 2007 +0000
@@ -22,9 +22,9 @@
 		win32/giowin32.c \
 		win32/win32dep.h
 
-if USE_GCONFTOOL
-GCONF_DIR=gconf
-endif
+# if USE_GCONFTOOL
+# GCONF_DIR=gconf
+# endif
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = purple.pc