[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-598-g85eea96

[Stefano Lattarini]

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 "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=85eea96a3159c41b6630fd26d6f090484a131460

The branch, master has been updated
       via  85eea96a3159c41b6630fd26d6f090484a131460 (commit)
       via  73b74f839340b94dad94f090e7d8291064104d0d (commit)
       via  ece3872f817855afd265b3a2187116b253439de0 (commit)
      from  ad748b8323dd2bac0dd61ac17c72ad363c68055c (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 -----------------------------------------------------------------
commit 85eea96a3159c41b6630fd26d6f090484a131460
Merge: ad748b8 73b74f8
Author: Stefano Lattarini <address@hidden>
Date:   Tue Jan 11 02:35:38 2011 +0100

    Merge branch 'maint'
    
    Conflicts:
        ChangeLog
    
    Apparently I messed up doing a previous 'git pull', so that the "latest"
    maint I've merged into master (and pushed!) wasn't a fast-forward from
    origin/maint.  Yay for me.  This merge should help cleaning up the mess.

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

Summary of changes:
 ChangeLog            |    5 +++++
 lib/Automake/Rule.pm |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 57c4241..8c5a8f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-09  Peter Rosin  <address@hidden>
+
+       Fix another typo in Rule.pm comment.
+       * lib/Automake/Rule.pm: Fix typo.
+
 2011-01-11  Stefano Lattarini  <address@hidden>
 
        tests: texinfo unrecognized extensions
diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm
index a59241f..137dbb0 100644
--- a/lib/Automake/Rule.pm
+++ b/lib/Automake/Rule.pm
@@ -385,7 +385,7 @@ sub reset()
 
 =item C<register_suffix_rule ($where, $src, $dest)>
 
-Register a suffix rules defined on C<$where> that transforms
+Register a suffix rule defined on C<$where> that transforms
 files ending in C<$src> into files ending in C<$dest>.
 
 This upgrades the C<$suffix_rules> variables.


hooks/post-receive
-- 
GNU Automake