/pidgin/main: f1e488454cc8: Merge heads.

[Elliott Sales de Andrade]

Changeset: f1e488454cc824ba42666eb3600e78069ceb4235
Author:	 Elliott Sales de Andrade <qulogic at pidgin.im>
Date:	 2012-08-14 00:05 -0400
Branch:	 default
URL: http://hg.pidgin.im/pidgin/main/rev/f1e488454cc8

Description:

Merge heads.

diffstat:

 finch/libgnt/Makefile.am |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff --git a/finch/libgnt/Makefile.am b/finch/libgnt/Makefile.am
--- a/finch/libgnt/Makefile.am
+++ b/finch/libgnt/Makefile.am
@@ -84,7 +84,7 @@ libgnt_lainclude_HEADERS = \
 	$(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) \