diff options
author | Mattias Andrée <maandree@operamail.com> | 2012-08-19 19:52:18 +0200 |
---|---|---|
committer | Mattias Andrée <maandree@operamail.com> | 2012-08-19 19:52:18 +0200 |
commit | 64b726770a07a0e04bcec3cf8ab23af4bcc2332f (patch) | |
tree | a2d2b4fb14895486c04262da022d4bdea7acd7d6 /manuals/manpage.6 | |
parent | 41b2d257c71f654dd2fd9921d1f75f44b97a6592 (diff) | |
parent | 6dc632a155db800997e0eb2dec420a6233a2d141 (diff) | |
download | ponysay-64b726770a07a0e04bcec3cf8ab23af4bcc2332f.tar.gz ponysay-64b726770a07a0e04bcec3cf8ab23af4bcc2332f.tar.bz2 ponysay-64b726770a07a0e04bcec3cf8ab23af4bcc2332f.zip |
merge conflict resolved
Diffstat (limited to 'manuals/manpage.6')
-rw-r--r-- | manuals/manpage.6 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/manuals/manpage.6 b/manuals/manpage.6 index af8fe2e..a9d5d33 100644 --- a/manuals/manpage.6 +++ b/manuals/manpage.6 @@ -104,7 +104,8 @@ Bugs can be reported in <\fBhttps://github.com/erkin/ponysay/issues\fP>. .br .SH AUTHOR ponysay was written by Erkin Batu Altunbaş <erkinbatu@gmail.com> -with major contributions from Mattias Andrée, Sven-Hendrik Haase, Jan Alexander Steffens et al. +with contributions from Mattias Andrée, Elis Axelsson, Sven-Hendrik Haase, +Pablo Lezaeta, Jan Alexander Steffens et al. .\" See file CREDITS for full list. .PP This manual page was originally written by Louis Taylor <kragniz@gmail.com> |