Merge branch 'maint-1.7.7' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2011 23:07:54 +0000 (15:07 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2011 23:07:54 +0000 (15:07 -0800)
* maint-1.7.7:
stripspace: fix outdated comment
Add MYMETA.yml to perl/.gitignore

builtin/stripspace.c
perl/.gitignore
index 4d3b93fedb5f2eca68edca15ca1e10cb60176d36..1288ffcc52530f8ef9561acd2eb2ec5322c9e230 100644 (file)
@@ -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.
  *
index 98b24772c7ebe838d513d8e24f3c8acff7839cb9..9235e73163204593379cdf6367133b5b503423c2 100644 (file)
@@ -1,5 +1,6 @@
 perl.mak
 perl.mak.old
+MYMETA.yml
 blib
 blibdirs
 pm_to_blib