aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2012-08-28 05:54:59 +0200
committerMattias Andrée <maandree@operamail.com>2012-08-28 05:54:59 +0200
commit3e7ef7ea1fd5ec9c4fc19dd19bb69f40933d0f51 (patch)
tree635d1c3af0da8b4caf70585e15d461304fe71f84
parentede27da6daf70cfabf9d2292576356564b4f3fde (diff)
downloadponysay-3e7ef7ea1fd5ec9c4fc19dd19bb69f40933d0f51.tar.gz
ponysay-3e7ef7ea1fd5ec9c4fc19dd19bb69f40933d0f51.tar.bz2
ponysay-3e7ef7ea1fd5ec9c4fc19dd19bb69f40933d0f51.zip
m + m fix + twilightstartswirlthebearded is rather long, reducing to twilightthebearded
-rw-r--r--CHANGELOG5
-rw-r--r--manuals/ponysay.texinfo5
-rw-r--r--ponies/twilightthebearded.pony (renamed from ponies/twilightstartswirlthebearded.pony)0
-rw-r--r--ttyponies/twilightthebearded.pony (renamed from ttyponies/twilightstartswirlthebearded.pony)0
4 files changed, 5 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 21b932b..bdee329 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,8 @@
Version 2.6
- New ponies: thunderlane, lemonhearts, twilightstartswirlthebearded,
- silverspeed, cutie mark crusaders (Scootaloo, Apple Bloom and Sweate bell)
+ New ponies: cutiemarkcrusaders, lemonhearts, silverspeed, thunderlane,
+ twilightthebearded
+
Version 2.5.1
diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo
index 8e0ac8b..fb94c73 100644
--- a/manuals/ponysay.texinfo
+++ b/manuals/ponysay.texinfo
@@ -1704,9 +1704,8 @@ sequences.
@itemize @bullet
@item
-New extraponies: @file{cutiemarkcrusaders}, @file{lemonhearts}, @file{thunderlane},
-@file{twilightstartswirlthebearded}
-@item
+New ponies: @file{cutiemarkcrusaders}, @file{lemonhearts}, @file{silverspeed},
+@file{thunderlane}, @file{twilightthebearded}
@end itemize
@heading Version 2.5.1
diff --git a/ponies/twilightstartswirlthebearded.pony b/ponies/twilightthebearded.pony
index b392ed4..b392ed4 100644
--- a/ponies/twilightstartswirlthebearded.pony
+++ b/ponies/twilightthebearded.pony
diff --git a/ttyponies/twilightstartswirlthebearded.pony b/ttyponies/twilightthebearded.pony
index f938650..f938650 100644
--- a/ttyponies/twilightstartswirlthebearded.pony
+++ b/ttyponies/twilightthebearded.pony