[Gnash-commit] [SCM] Gnash branch, master, updated. a6998aaff1fc95a40f3422c915a7ad68862f3610

[Rob Savoye]

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  a6998aaff1fc95a40f3422c915a7ad68862f3610 (commit)
       via  07512ec2918aeec0677d02fd4b36a326565c652b (commit)
      from  be63189bd65eccca4716eab29bb844271709c528 (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=a6998aaff1fc95a40f3422c915a7ad68862f3610


commit a6998aaff1fc95a40f3422c915a7ad68862f3610
Merge: 07512ec be63189
Author: Rob Savoye <address@hidden>
Date:   Sat Dec 11 15:52:31 2010 -0700

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


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


commit 07512ec2918aeec0677d02fd4b36a326565c652b
Author: Rob Savoye <address@hidden>
Date:   Sat Dec 11 15:51:31 2010 -0700

    escape after TS_LIBS

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:
 gui/fb/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Gnash