Merge heads.

Tue, 14 Aug 2012 00:05:30 -0400

author
Elliott Sales de Andrade <qulogic@pidgin.im>
date
Tue, 14 Aug 2012 00:05:30 -0400
changeset 33260
f1e488454cc8
parent 33259
51d25c394fca (current diff)
parent 33239
b309ed3fd011 (diff)
child 33261
1e26b193b3a5

Merge heads.

--- a/finch/libgnt/Makefile.am	Mon Aug 13 23:48:07 2012 -0400
+++ b/finch/libgnt/Makefile.am	Tue Aug 14 00:05:30 2012 -0400
@@ -84,7 +84,7 @@
 	$(libgnt_la_headers)
 
 libgnt_la_DEPENDENCIES = 
-libgnt_la_LDFLAGS = -export-dynamic -version_info $(GNT_LT_VERSION_INFO) -no-undefined
+libgnt_la_LDFLAGS = -export-dynamic -version-info $(GNT_LT_VERSION_INFO) -no-undefined
 libgnt_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(GNT_LIBS) \

mercurial