[Gnash-commit] [SCM] Gnash branch, master, updated. 32a0b8d2e59ad7d3f2add75eff7201eddff54c85

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  32a0b8d2e59ad7d3f2add75eff7201eddff54c85 (commit)
       via  f4e343c142b44cc9b7dc753270b6f96e4da18e9c (commit)
      from  a6998aaff1fc95a40f3422c915a7ad68862f3610 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=32a0b8d2e59ad7d3f2add75eff7201eddff54c85


commit 32a0b8d2e59ad7d3f2add75eff7201eddff54c85
Merge: f4e343c a6998aa
Author: Sandro Santilli <address@hidden>
Date:   Sat Dec 11 23:53:15 2010 +0100

    Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=f4e343c142b44cc9b7dc753270b6f96e4da18e9c


commit f4e343c142b44cc9b7dc753270b6f96e4da18e9c
Author: Sandro Santilli <address@hidden>
Date:   Sat Dec 11 23:53:02 2010 +0100

    Add missing newlines escape. Should fix build failures on lucid-linux-x86

diff --git a/gui/fb/Makefile.am b/gui/fb/Makefile.am
index 18a1832..096828b 100644
--- a/gui/fb/Makefile.am
+++ b/gui/fb/Makefile.am
@@ -69,7 +69,7 @@ AM_LDFLAGS =  \
        $(LIRC_LIBS) \
        $(MYSQL_LIBS) \
        $(INTLLIBS) \
-       $(TS_LIBS)
+       $(TS_LIBS) \
        $(BOOST_LIBS) \
        $(PTHREAD_LIBS) \
        $(NULL)

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
Gnash