resolve merge conflict + m

Signed-off-by: Mattias Andrée <maandree@operamail.com>
This commit is contained in:
Mattias Andrée 2013-06-01 07:05:29 +02:00
commit ae2856a54a
393 changed files with 2030 additions and 859 deletions

View file

@ -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.

View file

@ -1,5 +1,6 @@
/:/
\:\
X:X
n:_
:

View file

@ -1,5 +1,6 @@
/:o
\:o
X:o
n:_
:

View file

@ -1,5 +1,6 @@
/:/
\:\
X:X
n:_
s:-

View file

@ -1,5 +1,6 @@
/:o
\:o
X:o
n:_
s:-

View file

@ -1,5 +1,6 @@
/:/
\:\
X:X
n:─
:

View file

@ -1,5 +1,6 @@
/:
\:╲
X:
n:─
:

View file

@ -1,5 +1,6 @@
/:
\:╲
X:
n:─
:

View file

@ -1,5 +1,6 @@
/:o
\:o
X:o
n:⁀
s:‿

Binary file not shown.

View file

@ -0,0 +1,3 @@
PSD files are the same as the original. Sorry!
-Doctor Blade

View 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...

Binary file not shown.

After

Width:  |  Height:  |  Size: 694 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 681 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 723 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 688 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 700 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 684 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 681 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 692 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 682 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 713 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 708 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 704 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 691 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 701 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 682 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 688 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 701 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 700 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 685 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 695 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 716 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 719 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 705 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 668 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 682 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 693 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 684 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 674 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 678 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 684 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 688 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 695 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 701 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 688 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 697 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 727 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 754 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 736 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 747 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 732 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 735 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 719 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 747 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 730 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 732 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 739 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 733 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 738 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 730 B

Some files were not shown because too many files have changed in this diff Show more