[Gnash-commit] [SCM] Gnash branch, master, updated. 22a439f12857784559b86092cda346481721ca69

[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  22a439f12857784559b86092cda346481721ca69 (commit)
       via  d9542a13acc1a2ef847a52fb1842f5ce84923d93 (commit)
      from  d39f3c36e48e262abe3e54e818c1e4fa0208f47b (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=22a439f12857784559b86092cda346481721ca69


commit 22a439f12857784559b86092cda346481721ca69
Merge: d9542a1 d39f3c3
Author: Sandro Santilli <address@hidden>
Date:   Sat Nov 20 08:37:34 2010 +0100

    Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gnash
    
    Conflicts:
        testsuite/misc-ming.all/loading/Makefile.am

diff --cc testsuite/misc-ming.all/loading/Makefile.am
index 2dbfbe4,5a0a005..210a5de
--- a/testsuite/misc-ming.all/loading/Makefile.am
+++ b/testsuite/misc-ming.all/loading/Makefile.am
@@@ -166,7 -165,9 +166,6 @@@ LoadVarsTestRunner: $(srcdir)/../../gen
  
  
  
- 
 -clean-local: 
 -      rm -f *.swf *.pp *unner
 -
  TEST_DRIVERS = ../../simple.exp
  TEST_CASES = \
        loadMovieTestRunner \

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


commit d9542a13acc1a2ef847a52fb1842f5ce84923d93
Author: Sandro Santilli <address@hidden>
Date:   Sat Nov 20 08:36:56 2010 +0100

    Use CLEANFILES rather than clean-local

diff --git a/testsuite/misc-ming.all/loading/Makefile.am 
b/testsuite/misc-ming.all/loading/Makefile.am
index ce64610..2dbfbe4 100644
--- a/testsuite/misc-ming.all/loading/Makefile.am
+++ b/testsuite/misc-ming.all/loading/Makefile.am
@@ -26,7 +26,8 @@ CLEANFILES =  \
        gnash-dbg.log \
        site.exp.bak \
        testrun.sum \
-       testrun.log
+       testrun.log \
+       *.swf *.pp *unner
 
 EXTRA_DIST = \
        $(NULL)
@@ -165,8 +166,6 @@ LoadVarsTestRunner: $(srcdir)/../../generic-testrunner.sh 
LoadVarsTest.swf
 
 
 
-clean-local: 
-       -rm *.swf *.pp *unner
 
 TEST_DRIVERS = ../../simple.exp
 TEST_CASES = \

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

Summary of changes:
 testsuite/misc-ming.all/loading/Makefile.am |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Gnash