resolve merge conflict + m
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Mattias Andrée
|
|
@ -1,8 +1,9 @@
|
|||
Version 3.0.2
|
||||
|
||||
New ponies: brucemane, deepblue, hairytipper, peachbottom, rainbowdrop, strawberrycream, wildflower
|
||||
New ponies: brucemane, cremebrulee, deepblue, hairytipper, mantishy, mule, peachbottom, rainbowdashcrystal,
|
||||
rainbowdrop, strawberrycream, unclewing, wildflower
|
||||
|
||||
New extraponies: milky
|
||||
New extraponies: firefox, fluffle, IE, milky
|
||||
|
||||
Default value for -W has been changed from 40 to 60.
|
||||
|
||||
|
|
@ -10,6 +11,8 @@ Version 3.0.2
|
|||
|
||||
Swedish manual page added.
|
||||
|
||||
Added manpage for ponysay-tool
|
||||
|
||||
|
||||
Version 3.0.1
|
||||
|
||||
|
|
@ -459,7 +462,7 @@ Version 0.7
|
|||
|
||||
Version 0.6
|
||||
|
||||
New ponies: bonbon, celestia, doctor, fillistia,
|
||||
New ponies: bonbon, celestia, doctor, fillistia (filly Celestia),
|
||||
spitfire, woona (not moonstuck).
|
||||
|
||||
Dropping usage of utility 'which', using 'hash' instead.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
/:/
|
||||
\:\
|
||||
X:X
|
||||
|
||||
n:_
|
||||
:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
/:o
|
||||
\:o
|
||||
X:o
|
||||
|
||||
n:_
|
||||
:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
/:/
|
||||
\:\
|
||||
X:X
|
||||
|
||||
n:_
|
||||
s:-
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
/:o
|
||||
\:o
|
||||
X:o
|
||||
|
||||
n:_
|
||||
s:-
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
/:/
|
||||
\:\
|
||||
X:X
|
||||
|
||||
n:─
|
||||
:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
/:╱
|
||||
\:╲
|
||||
X:╳
|
||||
|
||||
n:─
|
||||
:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
/:╱
|
||||
\:╲
|
||||
X:╳
|
||||
|
||||
n:─
|
||||
:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
/:o
|
||||
\:o
|
||||
X:o
|
||||
|
||||
n:⁀
|
||||
s:‿
|
||||
|
|
|
|||
BIN
dev/Templates from Desktop ponies/BASE_PONY.psd
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
PSD files are the same as the original. Sorry!
|
||||
|
||||
-Doctor Blade
|
||||
10
dev/Templates from Desktop ponies/INFO
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
Template info
|
||||
|
||||
This template was created by Bot-chan, Doctor Blade, StarStep and others
|
||||
originally for 'Desktop ponies' but they mention on 'ponychan' and on they
|
||||
Deviantart Desktop opnies group that anypony can use them if they give credits
|
||||
and not make profit from there, respect the authors and they work.
|
||||
As same time they say that Ponies enough Different from the templates can by
|
||||
concideres differents ponies.
|
||||
|
||||
Fell free to use or modify...
|
||||
|
After 
(image error) Size: 9.8 KiB |
|
After 
(image error) Size: 694 B |
|
After 
(image error) Size: 681 B |
|
After 
(image error) Size: 723 B |
|
After 
(image error) Size: 688 B |
|
After 
(image error) Size: 700 B |
|
After 
(image error) Size: 684 B |
|
After 
(image error) Size: 681 B |
|
After 
(image error) Size: 692 B |
|
After 
(image error) Size: 682 B |
|
After 
(image error) Size: 713 B |
|
After 
(image error) Size: 708 B |
|
After 
(image error) Size: 704 B |
|
After 
(image error) Size: 691 B |
|
After 
(image error) Size: 701 B |
|
After 
(image error) Size: 682 B |
|
After 
(image error) Size: 688 B |
|
After 
(image error) Size: 701 B |
|
After 
(image error) Size: 700 B |
|
After 
(image error) Size: 11 KiB |
|
After 
(image error) Size: 685 B |
|
After 
(image error) Size: 695 B |
|
After 
(image error) Size: 716 B |
|
After 
(image error) Size: 719 B |
|
After 
(image error) Size: 705 B |
|
After 
(image error) Size: 668 B |
|
After 
(image error) Size: 682 B |
|
After 
(image error) Size: 693 B |
|
After 
(image error) Size: 684 B |
|
After 
(image error) Size: 674 B |
|
After 
(image error) Size: 678 B |
|
After 
(image error) Size: 684 B |
|
After 
(image error) Size: 688 B |
|
After 
(image error) Size: 695 B |
|
After 
(image error) Size: 701 B |
|
After 
(image error) Size: 688 B |
|
After 
(image error) Size: 697 B |
|
After 
(image error) Size: 727 B |
|
After 
(image error) Size: 10 KiB |
|
After 
(image error) Size: 754 B |
|
After 
(image error) Size: 736 B |
|
After 
(image error) Size: 747 B |
|
After 
(image error) Size: 732 B |
|
After 
(image error) Size: 735 B |
|
After 
(image error) Size: 719 B |
|
After 
(image error) Size: 747 B |
|
After 
(image error) Size: 730 B |
|
After 
(image error) Size: 732 B |
|
After 
(image error) Size: 739 B |
|
After 
(image error) Size: 733 B |
|
After 
(image error) Size: 738 B |
|
After 
(image error) Size: 730 B |