[Gnash-commit] [SCM] Gnash branch, master, updated. 0726cd5d5eff8025fa789fabdd308cc59398632f

[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  0726cd5d5eff8025fa789fabdd308cc59398632f (commit)
       via  a62d788483416c209be6d4805bd3dd21143406e3 (commit)
      from  09cac2a8aff7b2013ddcde3302643a149e18adb4 (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=0726cd5d5eff8025fa789fabdd308cc59398632f


commit 0726cd5d5eff8025fa789fabdd308cc59398632f
Merge: a62d788 09cac2a
Author: Rob Savoye <address@hidden>
Date:   Thu Jan 13 07:48:54 2011 -0700

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


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


commit a62d788483416c209be6d4805bd3dd21143406e3
Author: Rob Savoye <address@hidden>
Date:   Thu Jan 13 07:48:39 2011 -0700

    don't redefine AM_CPPFLAGS

diff --git a/extensions/launcher/Makefile.am b/extensions/launcher/Makefile.am
index f424b3a..b25468a 100644
--- a/extensions/launcher/Makefile.am
+++ b/extensions/launcher/Makefile.am
@@ -23,8 +23,7 @@ pluginsdir = $(libdir)/gnash/plugins
 plugins_LTLIBRARIES = launcher_ext.la
 bin_PROGRAMS = launcher-gnash
 
-AM_CPPFLAGS = -DGNASHBINDIR=\"${bindir}\" 
-AM_CPPFLAGS =  \
+AM_CPPFLAGS = -DGNASHBINDIR=\"${bindir}\" \
             -I$(top_srcdir)/libbase \
             -I$(top_srcdir)/libcore \
             -I$(top_srcdir)/libcore/abc \

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

Summary of changes:
 extensions/launcher/Makefile.am |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Gnash