summaryrefslogtreecommitdiff
path: root/t/t5100/patch0012
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-03-12 21:44:00 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-12 21:44:00 -0700
commite89b991a7fe7e400d96bd69272bf6c9dbade4d2c (patch)
treeaa3a7dd6786690b4dfd55d6222226bea2b76a0bd /t/t5100/patch0012
parentMerge branch 'jk/maint-1.6.1-cleanup-after-exec-failure' into maint-1.6.1 (diff)
parentmailinfo: tests for RFC2047 examples (diff)
downloadtgif-e89b991a7fe7e400d96bd69272bf6c9dbade4d2c.tar.xz
Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.1
* ks/maint-1.6.0-mailinfo-folded: mailinfo: tests for RFC2047 examples mailinfo: add explicit test for mails like '<a.u.thor@example.com> (A U Thor)' mailinfo: 'From:' header should be unfold as well mailinfo: correctly handle multiline 'Subject:' header
Diffstat (limited to 't/t5100/patch0012')
-rw-r--r--t/t5100/patch001230
1 files changed, 30 insertions, 0 deletions
diff --git a/t/t5100/patch0012 b/t/t5100/patch0012
new file mode 100644
index 0000000000..36a0b68161
--- /dev/null
+++ b/t/t5100/patch0012
@@ -0,0 +1,30 @@
+---
+ howto/build_navy.txt | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/howto/build_navy.txt b/howto/build_navy.txt
+index 3fd3afb..0ee807e 100644
+--- a/howto/build_navy.txt
++++ b/howto/build_navy.txt
+@@ -119,8 +119,8 @@
+ - libxv-dev
+ - libusplash-dev
+ - latex-make
+- - textlive-lang-cyrillic
+- - textlive-latex-extra
++ - texlive-lang-cyrillic
++ - texlive-latex-extra
+ - dia
+ - python-pyrex
+ - libtool
+@@ -128,7 +128,7 @@
+ - sox
+ - cython
+ - imagemagick
+- - docutils
++ - python-docutils
+
+ #. на машине dinar: добавить свой открытый ssh-ключ в authorized_keys2 пользователя ddev
+ #. на своей машине: отредактировать /etc/sudoers (команда ``visudo``) примерно следующим образом::
+--
+1.5.6.5