merge of 'f985cbae83fd437653f6f8fa079ae966a98c23ed'

Thu, 03 May 2007 23:42:41 +0000

author
Stu Tomlinson <nosnilmot@pidgin.im>
date
Thu, 03 May 2007 23:42:41 +0000
changeset 16904
432225602457
parent 16903
f985cbae83fd (current diff)
parent 16892
ed16a9041350 (diff)
child 16905
acf660a24685

merge of 'f985cbae83fd437653f6f8fa079ae966a98c23ed'
and 'ed16a904135053cfdb1044000d43a485312a4c8d'

--- a/libpurple/plugins/Makefile.am	Thu May 03 23:23:44 2007 +0000
+++ b/libpurple/plugins/Makefile.am	Thu May 03 23:42:41 2007 +0000
@@ -128,7 +128,6 @@
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
 	-DVERSION=\"$(VERSION)\" \
-	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	$(DEBUG_CFLAGS) \

mercurial