Merge branch 'maint-1.7.6' into maint-1.7.7

* maint-1.7.6: stripspace: fix outdated comment Add MYMETA.yml to perl/.gitignore
git · Dec 5, 2011 · c34ba99 · c34ba99
2 parents 1e501a7 + c2857fb
commit c34ba99
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/builtin/stripspace.c b/builtin/stripspace.c
@@ -22,8 +22,6 @@ static size_t cleanup(char *line, size_t len)
  * Remove empty lines from the beginning and end
  * and also trailing spaces from every line.
  *
- * Note that the buffer will not be NUL-terminated.
- *
  * Turn multiple consecutive empty lines between paragraphs
  * into just one empty line.
  *

diff --git a/perl/.gitignore b/perl/.gitignore
@@ -1,5 +1,6 @@
 perl.mak
 perl.mak.old
+MYMETA.yml
 blib
 blibdirs
 pm_to_blib