From: Mikael Magnusson <mikachu@comhem.se>
Date: Mon, 28 Nov 2005 14:26:41 +0000 (+0000)
Subject: testing branching
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=c81ffea4f9f545d8a0a3a3146712df4f967ae1b0;hp=f24cd3fc9dc8c06cfec43938ef8aa3d0fddeb0b5;p=chaz%2Fopenbox

testing branching
---

diff --git a/Makefile.am b/Makefile.am
index 710999c7..8d554250 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,6 +62,7 @@ render_libobrender_la_LIBADD = \
 	$(XFT_LIBS) \
 	$(PANGO_LIBS) \
 	$(GLIB_LIBS) \
+	$(PANGO_LIBS) \
 	$(XML_LIBS) 
 render_libobrender_la_SOURCES = \
 	gettext.h \
@@ -130,6 +131,8 @@ openbox_openbox_LDADD = \
 	$(LIBINTL) \
 	render/libobrender.la \
 	parser/libobparser.la
+#	$(XFT_LIBS) \
+#	$(PANGO_LIBS) \
 openbox_openbox_LDFLAGS = -export-dynamic
 openbox_openbox_SOURCES = \
 	gettext.h \