# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1187709003 0
# Node ID 215c02a8ff884e618e081380da033fa09a9508f0
# Parent  0e1a2b80fc68d63c426914207eb412321bea256c
ChangeLog MySpace

diff -r 0e1a2b80fc68 -r 215c02a8ff88 ChangeLog
--- a/ChangeLog	Tue Aug 21 07:12:51 2007 +0000
+++ b/ChangeLog	Tue Aug 21 15:10:03 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.
diff -r 0e1a2b80fc68 -r 215c02a8ff88 libpurple/Makefile.am
--- a/libpurple/Makefile.am	Tue Aug 21 07:12:51 2007 +0000
+++ b/libpurple/Makefile.am	Tue Aug 21 15:10:03 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