diff options
author | Mattias Andrée <maandree@operamail.com> | 2012-08-23 03:19:57 +0200 |
---|---|---|
committer | Mattias Andrée <maandree@operamail.com> | 2012-08-23 03:19:57 +0200 |
commit | 38324c570b954f075865ea59abaf2c6caf0c1de0 (patch) | |
tree | 92b4e78b27465a839da63544802c99ec1ff06faa /manuals/ponysay.texinfo | |
parent | 8c0cb19323d385b6a2bdbc654b096038893e9b05 (diff) | |
parent | 1906e0f573b7476636735fa6d60d865c01f1acf8 (diff) | |
download | ponysay-38324c570b954f075865ea59abaf2c6caf0c1de0.tar.gz ponysay-38324c570b954f075865ea59abaf2c6caf0c1de0.tar.bz2 ponysay-38324c570b954f075865ea59abaf2c6caf0c1de0.zip |
info change log update + merge conflict
Diffstat (limited to 'manuals/ponysay.texinfo')
-rw-r--r-- | manuals/ponysay.texinfo | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo index 0b3ff0f..5732fb0 100644 --- a/manuals/ponysay.texinfo +++ b/manuals/ponysay.texinfo @@ -1315,13 +1315,15 @@ Support cowsay style message compression. @item New ponies: @file{blaze} @item +New extraponies: @file{fyrefly} (Tumblr), @file{surprise} (Tumblr), @file{woona} +(moonstuck), @file{woonanohat} (moonstuck) +@item Pony symlink added: @itemize @bullet @item @file{pinkieoink} → @file{oinkoinkoink} @end itemize @item -Support for non-MLP:FiM ponies (known as extraponies), although the directory -is currently empty. +Support for non-MLP:FiM ponies (known as extraponies). @c BEGIN the following is too descriptive for the plain/text change log This is implemented with the options @option{-F}, @option{+l}, and @option{+L} corresponding to @option{-f}, @option{-l}, and @option{-L}. |