Merge remote-tracking branch 'upstream/master'

2024-11-25 05:47:59 +01:00 · 2012-07-19 18:47:07 -04:00 · 2012-07-19 18:47:07 -04:00 · 11211a6a6e
commit 11211a6a6e
parent a2752d20b3 ebec424353
12 changed files with 10 additions and 2 deletions
--- a/ponies/amethyststar
+++ b/ponies/amethyststar
@ -0,0 +1 @@
+./sparkler
--- a/ponies/berrypinch
+++ b/ponies/berrypinch
@ -0,0 +1 @@
+./ruby
--- a/ponies/craftycrate
+++ b/ponies/craftycrate
@ -0,0 +1 @@
+./boxxy
--- a/ponies/perry.pony
+++ b/ponies/perry.pony
@ -1 +0,0 @@
-pokey.pony
--- a/ponies/powderrouge
+++ b/ponies/powderrouge
@ -0,0 +1 @@
+./sindy
--- a/ponies/royalribbon
+++ b/ponies/royalribbon
@ -0,0 +1 @@
+./violet
--- a/ttyponies/amethyststar
+++ b/ttyponies/amethyststar
@ -0,0 +1 @@
+./sparkler
--- a/ttyponies/berrypinch
+++ b/ttyponies/berrypinch
@ -0,0 +1 @@
+./ruby
--- a/ttyponies/craftycrate
+++ b/ttyponies/craftycrate
@ -0,0 +1 @@
+./boxxy
--- a/ttyponies/perry.pony
+++ b/ttyponies/perry.pony
@ -1 +0,0 @@
-pokey.pony
--- a/ttyponies/powderrouge
+++ b/ttyponies/powderrouge
@ -0,0 +1 @@
+./sindy
--- a/ttyponies/royalribbon
+++ b/ttyponies/royalribbon
@ -0,0 +1 @@
+./violet