diff options
| author | Mattias Andrée <maandree@operamail.com> | 2012-10-11 23:09:44 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2012-10-11 23:09:44 +0200 |
| commit | 43959ae2c58c9996f030d9e5d2918b58b198bf54 (patch) | |
| tree | ceea7bd8e5ff7b3606409201269e1fb07a8572a9 /dev | |
| parent | 6892c51ba65bccfb06fef3cf0413bd87185b0aa1 (diff) | |
| parent | d6ff403fc7122fdb818c7600c875589141f3b126 (diff) | |
| download | ponysay-43959ae2c58c9996f030d9e5d2918b58b198bf54.tar.gz ponysay-43959ae2c58c9996f030d9e5d2918b58b198bf54.tar.bz2 ponysay-43959ae2c58c9996f030d9e5d2918b58b198bf54.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/pony-checklist | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dev/pony-checklist b/dev/pony-checklist index 3cd8f44..f69f7a0 100644 --- a/dev/pony-checklist +++ b/dev/pony-checklist @@ -195,7 +195,7 @@ Noteworthy Nurse Coldheart http://images4.wikia.nocookie.net/__cb20120205002823/mlp/images/thumb/8/80/S02E16_UEM2.png/150px-S02E16_UEM2.png Nurse Redheart Nurse Sweetheart http://images4.wikia.nocookie.net/__cb20120205002822/mlp/images/thumb/e/e8/S02E16_UEM1.png/150px-S02E16_UEM1.png -Nurse Tenderheart http://images3.wikia.nocookie.net/__cb20120607003107/mlp/images/thumb/a/ab/Tenderheart.png/150px-Tenderheart.png +Nurse Tenderheart Oakey Doke http://images1.wikia.nocookie.net/__cb20120130080532/mlp/images/thumb/d/de/S01E01_UEM1.png/150px-S01E01_UEM1.png Octavia Oregon Trail http://images1.wikia.nocookie.net/__cb20120107203156/mlp/images/thumb/2/2d/S02E12_UES5.png/150px-S02E12_UES5.png @@ -241,7 +241,7 @@ Soigne Folio Spring Water http://images3.wikia.nocookie.net/__cb20110822223834/mlp/images/thumb/e/e5/Spring_Water.png/150px-Spring_Water.png Squeaky Clean http://images1.wikia.nocookie.net/__cb20120212055960/mlp/images/thumb/2/23/Too_clean.png/150px-Too_clean.png Star Gazer http://images1.wikia.nocookie.net/__cb20110822222717/mlp/images/thumb/5/53/Star_Gazer.png/150px-Star_Gazer.png -Starlight http://images3.wikia.nocookie.net/__cb20110822004144/mlp/images/thumb/d/da/Pink_cheerleader_pony_S1E13.png/150px-Pink_cheerleader_pony_S1E13.png +Starligh Steamer http://images2.wikia.nocookie.net/__cb20120311212902/mlp/images/thumb/1/18/Train_driver_s02e14.png/150px-Train_driver_s02e14.png Stella Storm http://images2.wikia.nocookie.net/__cb20110822224060/mlp/images/thumb/0/07/Storm.png/150px-Storm.png @@ -653,7 +653,7 @@ Mr. Turnip Rocky Sir Lintsalot Madame Le Flour -Tom http://mlp.wikia.com/wiki/Inanimate_objects#Tom +Tom Smarty Pants http://mlp.wikia.com/wiki/Inanimate_objects#Smarty_Pants Ahuitzotl http://mlp.wikia.com/wiki/Ahuitzotl Angel |