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

This commit is contained in:
Mattias Andrée 2012-11-18 06:45:14 +01:00
commit 63fb20f8e9
2 changed files with 8 additions and 8 deletions

View file

@ -1,13 +1,13 @@
$$$ $$$
OTHER NAMES: celestia BASED ON: celestia
KIND: alicorn
COAT: white COAT: white
NAME: princess celestia
MANE: blue, green, pink, cyan
EYE: purple EYE: purple
FREE: no FREE: no
GROUP: filly GROUP: filly
BASED ON: celestia KIND: alicorn
MANE: pastel
NAME: princess celestia
OTHER NAMES: celestia
WIDTH: 47 WIDTH: 47
HEIGHT: 27 HEIGHT: 27

View file

@ -1,13 +1,13 @@
$$$ $$$
APPEARANCE: s1c1m5s9 APPEARANCE: s1c1m5s9
AURA: white, dark (see 'The crystal empire part 1') AURA: yellow, dark (see 'The crystal empire part 1')
COAT: realy light pink COAT: white
EYE: pink EYE: pink
FREE: no FREE: no
GROUP: mare GROUP: mare
GROUP NAME: royal GROUP NAME: royal
KIND: alicorn KIND: alicorn
MANE: pink, cyan, green, blue MANE: pastel
MEDIA: TV series MEDIA: TV series
NAME: princess celestia NAME: princess celestia
OTHER NAMES: celestia OTHER NAMES: celestia