diff options
author | Pablo Lezaeta <prflr88@gmail.com> | 2012-07-19 18:47:07 -0400 |
---|---|---|
committer | Pablo Lezaeta <prflr88@gmail.com> | 2012-07-19 18:47:07 -0400 |
commit | 11211a6a6e2ef042f022423b05af7c3d0bf9c0da (patch) | |
tree | a0d24fc5a3112e212dd68de1b6175cc85bc952b4 | |
parent | a2752d20b3061d0052b3844c00c155b3853cb35c (diff) | |
parent | ebec4243536fa06889d035b174963765a6188c0d (diff) | |
download | ponysay-11211a6a6e2ef042f022423b05af7c3d0bf9c0da.tar.gz ponysay-11211a6a6e2ef042f022423b05af7c3d0bf9c0da.tar.bz2 ponysay-11211a6a6e2ef042f022423b05af7c3d0bf9c0da.zip |
Merge remote-tracking branch 'upstream/master'
l--------- | ponies/amethyststar | 1 | ||||
l--------- | ponies/berrypinch | 1 | ||||
l--------- | ponies/craftycrate | 1 | ||||
l--------- | ponies/perry.pony | 1 | ||||
l--------- | ponies/powderrouge | 1 | ||||
l--------- | ponies/royalribbon | 1 | ||||
l--------- | ttyponies/amethyststar | 1 | ||||
l--------- | ttyponies/berrypinch | 1 | ||||
l--------- | ttyponies/craftycrate | 1 | ||||
l--------- | ttyponies/perry.pony | 1 | ||||
l--------- | ttyponies/powderrouge | 1 | ||||
l--------- | ttyponies/royalribbon | 1 |
12 files changed, 10 insertions, 2 deletions
diff --git a/ponies/amethyststar b/ponies/amethyststar new file mode 120000 index 0000000..01ee830 --- /dev/null +++ b/ponies/amethyststar @@ -0,0 +1 @@ +./sparkler
\ No newline at end of file diff --git a/ponies/berrypinch b/ponies/berrypinch new file mode 120000 index 0000000..3d4539d --- /dev/null +++ b/ponies/berrypinch @@ -0,0 +1 @@ +./ruby
\ No newline at end of file diff --git a/ponies/craftycrate b/ponies/craftycrate new file mode 120000 index 0000000..c164882 --- /dev/null +++ b/ponies/craftycrate @@ -0,0 +1 @@ +./boxxy
\ No newline at end of file diff --git a/ponies/perry.pony b/ponies/perry.pony deleted file mode 120000 index c66432d..0000000 --- a/ponies/perry.pony +++ /dev/null @@ -1 +0,0 @@ -pokey.pony
\ No newline at end of file diff --git a/ponies/powderrouge b/ponies/powderrouge new file mode 120000 index 0000000..127424f --- /dev/null +++ b/ponies/powderrouge @@ -0,0 +1 @@ +./sindy
\ No newline at end of file diff --git a/ponies/royalribbon b/ponies/royalribbon new file mode 120000 index 0000000..8819d6d --- /dev/null +++ b/ponies/royalribbon @@ -0,0 +1 @@ +./violet
\ No newline at end of file diff --git a/ttyponies/amethyststar b/ttyponies/amethyststar new file mode 120000 index 0000000..01ee830 --- /dev/null +++ b/ttyponies/amethyststar @@ -0,0 +1 @@ +./sparkler
\ No newline at end of file diff --git a/ttyponies/berrypinch b/ttyponies/berrypinch new file mode 120000 index 0000000..3d4539d --- /dev/null +++ b/ttyponies/berrypinch @@ -0,0 +1 @@ +./ruby
\ No newline at end of file diff --git a/ttyponies/craftycrate b/ttyponies/craftycrate new file mode 120000 index 0000000..c164882 --- /dev/null +++ b/ttyponies/craftycrate @@ -0,0 +1 @@ +./boxxy
\ No newline at end of file diff --git a/ttyponies/perry.pony b/ttyponies/perry.pony deleted file mode 120000 index c66432d..0000000 --- a/ttyponies/perry.pony +++ /dev/null @@ -1 +0,0 @@ -pokey.pony
\ No newline at end of file diff --git a/ttyponies/powderrouge b/ttyponies/powderrouge new file mode 120000 index 0000000..127424f --- /dev/null +++ b/ttyponies/powderrouge @@ -0,0 +1 @@ +./sindy
\ No newline at end of file diff --git a/ttyponies/royalribbon b/ttyponies/royalribbon new file mode 120000 index 0000000..8819d6d --- /dev/null +++ b/ttyponies/royalribbon @@ -0,0 +1 @@ +./violet
\ No newline at end of file |