# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1188429286 0
# Node ID 7c84cbb57972f77b8a1e6de13dfd24bec9fc1d32
# Parent  215c02a8ff884e618e081380da033fa09a9508f0
disapproval of revision '8d675a1883a0f1c7f3c08d9b12242cd3fc7bcaf9'

diff -r 215c02a8ff88 -r 7c84cbb57972 ChangeLog
--- 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.
diff -r 215c02a8ff88 -r 7c84cbb57972 libpurple/Makefile.am
--- 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