Mercurial > pidgin

changeset 19406:7c84cbb57972

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
disapproval of revision '8d675a1883a0f1c7f3c08d9b12242cd3fc7bcaf9'
author Richard Laager <rlaager@wiktel.com>
date Wed, 29 Aug 2007 23:14:46 +0000
parents 215c02a8ff88
children a77432fe2f3b
files ChangeLog libpurple/Makefile.am
diffstat 2 files changed, 3 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Aug 21 15:10:03 2007 +0000
+++ b/ChangeLog	Wed Aug 29 23:14:46 2007 +0000
@@ -1,9 +1,5 @@
 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	Tue Aug 21 15:10:03 2007 +0000
+++ b/libpurple/Makefile.am	Wed Aug 29 23:14: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