Merge branch 'develop' of github.com:erkin/ponysay into develop

This commit is contained in:
Mattias Andrée 2013-04-01 16:14:08 +02:00
commit 04a2a6e367
3 changed files with 3 additions and 3 deletions

View file

@ -10,7 +10,7 @@ KIND: earth
LINK: regular LINK: regular
MANE: blue MANE: blue
NAME: (not mentioned) NAME: (not mentioned)
OTHER NAMES: Aloe (unofficial) OTHER NAMES: Aloe (official,on merchandise)
POSE: stand POSE: stand
SOURCE: (Jay Wright/Monkey Jay) Desktop ponies SOURCE: (Jay Wright/Monkey Jay) Desktop ponies
WIDTH: 39 WIDTH: 39

View file

@ -9,7 +9,7 @@ GROUP: stallion
KIND: unicorn KIND: unicorn
LINK: regular LINK: regular
MANE: blue MANE: blue
NAME: Fancypants NAME: Fancy Pants
POSE: stand POSE: stand
SOURCE: (Pony Noia) Desktop ponies SOURCE: (Pony Noia) Desktop ponies
WIDTH: 46 WIDTH: 46

View file

@ -10,7 +10,7 @@ KIND: earth
LINK: regular LINK: regular
MANE: brown MANE: brown
NAME: (not mentioned) NAME: (not mentioned)
OTHER NAMES: Walter Coltchak (official, stated official by the crew) OTHER NAMES: Walter Coltchak (official, stated official by the crew), Walter (official, on Gamelof game source code)
POSE: stand POSE: stand
SOURCE: (Bot-chan) Desktop ponies SOURCE: (Bot-chan) Desktop ponies
WIDTH: 40 WIDTH: 40