Permalink
Browse files

info change log update + merge conflict

  • Loading branch information...
2 parents 8c0cb19 + 1906e0f commit 38324c570b954f075865ea59abaf2c6caf0c1de0 @maandree maandree committed Aug 23, 2012
View
@@ -15,10 +15,12 @@ Version 2.3
New ponies: blaze
+ New extraponies: fyrefly (Tumblr), surprise (Tumblr), woona (moonstuck),
+ woonanohat (moonstuck)
+
Pony symlink added: pinkieoink → oinkoinkoink
- Support for non-MLP:FiM ponies (known as extraponies),
- although the directory is currently empty.
+ Support for non-MLP:FiM ponies (known as extraponies).
Version 2.2
View
@@ -0,0 +1,37 @@
+$balloon18$
+ $\$
+ $\$
+ $\$
+ ▄▀▄ ▄▄▀▀▀ ▄ 
+ ▄▀▄   ▄▀▀ ▀▀▄▄ 
+      ▄ ▀▄ 
+   ▀ ▀▄ ▄▄▄▄▄▀▄
+   ▀▄▄▄ ▀▄ ▀▀
+ ▄  ▄▀▀ ▀▀▀▄▄▄ 
+ ▄     ▄ ▀ ▀▄ ▄ 
+  ▄▀ ▀▄▄▄▄ ▀▄▄▄ 
+ ▄▀  ▀▄ ▀ ▄▄▄ ▀  
+ ▄    ▄ ▀▄ ▀▀▀▀ ▀ ▄ 
+  ▄▄▄   ▀▄ ▀▄  ▄▀ ▄▀▀  
+ ▀▄    ▄▀▄   ▄▀    ▄▀ 
+  ▄ ▀  ▄   ▄  ▄ ▀▄ ▀  ▄ ▀ 
+ ▀▄  ▀▀   ▄   ▄▀▀▀▀▄ ▄▀▀  ▄▀
+ ▀▄ ▀▄ ▀ ▄▀ ▀▄ ▀  ▄  ▀▀ 
+ ▀▀▀ ▀▀▀▄  ▄ ▀     
+ ▄▀ ▀▄ ▄▀   ▄▀ 
+ ▄▀ ▄ ▄▀▄▀▄ ▀▀ ▀ 
+ ▄▄▄▀ ▄▄▀ ▀▄    
+ ▄▄▀▀    ▄   ▀▄   
+ ▄▀▀ ▄▀  ▀  ▄ ▀▀ 
+       ▄▄▄▀ ▄▄▄▀ 
+   ▄▀       ▀▄ ▀▄ 
+   ▄▀         ▀▄ 
+     ▄     ▄▀ ▀▄▄▄▀ 
+  ▀▀▄  ▀  ▀▄▄▄▀ 
+  ▀     ▀ 
+ ▀     
+   ▄▀ 
+ ▀▄   
+  ▀▀ 
+  ▀ 
+ ▄▀ 
View
@@ -1,3 +0,0 @@
-Dummy file for this directory as it is otherwise empty.
-
-Non-MLP:FiM ponies should be placed here.
View
@@ -0,0 +1,26 @@
+$balloon35$
+ $\$
+ $\$
+ $\$
+ ▄▄▄ ▄▀▀ ▄ 
+ ▄▀▀ ▀▄▀ ▄▀   
+ ▄▀  ▄▀▀  ▀ ▄▀  ▀▀▄ 
+   ▀▄▀▄  ▄▄▄▄▄▀▀ ▀▄ ▄▄▄▄ 
+       ▀▄  ▀▀  
+ ▀▄ ▄ ▀▄▀▀▀▄ ▀▄    
+ ▀▄ ▀ ▀▀  ▀      ▀▀▀ 
+ ▄ ▀▀▀▀▀▄ ▄▀▀▀ ▀ ▀▄ ▀   ▀    ▀▄▄ 
+  ▄ ▀▄▄▄▄▀▄▄  ▀ ▀▄▄▀▄ ▀▄▀ ▀▀▄ ▀▄  
+ ▄▄▄     ▄▄▄▀▄    ▀▄▄▀▀ ▀▄  ▀▀ 
+ ▄▀ ▀▀      ▀▄▀▀▄▄▄▄▄▀▀▄▄▀    ▀▀▀▀▀ 
+   ▄▄▄ ▀   ▀  ▄▄ ▄▀       
+ ▀▄  ▀ ▄▄▄▄    ▄▄▀▀ ▄▄▀ ▀ ▀▄   
+ ▀▄ ▀▄  ▀▀▀ ▀  ▄   ▀▄▀▄▄▄    
+ ▄▀ ▀▄     ▀▄▀▀▀▀▀ ▄▀ 
+   ▄▄▄▀▀▄▄▄   ▄▀▀ ▄▀▀▀▀▀   ▄  
+  ▀ ▄ ▀  ▀▄     ▄▀         
+ ▀ ▀▀▀ ▀▄ ▄▀ ▄▀           
+   ▀▄ ▀ ▀▀▀▀           ▀▄ 
+ ▀ ▀▀   ▄▀         ▀  
+ ▀▀▀▀    ▀▀▀ ▀▄ ▀ ▀▀ 
+ ▀▀▀▀▀▀ ▀▀▀▀▀▀ 
View
@@ -0,0 +1,27 @@
+$balloon20$
+ $\$
+ $\$
+ $\$
+ ▄▄ ▀  
+ ▄▄▄▄ ▄▄ ▀ ▄▀  
+ ▀▄ ▀▀▄▄ ▀▄▀▄   
+ ▄▄ ▄ ▀ ▀ ▀▄▄ ▄▀▄  
+ ▄▀▄▀ ▀▀  ▀▀▄ ▀▄ ▄  
+ ▄▀ ▀▄▄ ▀▀   ▄▀▄ ▀▄▄  
+   ▄▀ ▄▄▄▀     ▄ ▀▄▄ 
+    ▄▀▀ ▀ ▀▄▄  ▀▄ ▀ ▀▄▀ 
+ ▀▄    ▀▀  ▀   ▀▄▀▀ 
+  ▀    ▄▄▀ ▄▄▄     ▄▄▄▄▄ 
+ ▄ ▀▄ ▄▄▀▄ ▀▀▄   ▄▄▀▀ ▀▀▄ 
+   ▀▄▄ ▄   ▄▄▀▀ ▄▀   
+   ▄ ▀▀▄▄▄▀ ▀▄▀  ▄▄ ▀ ▀▀  
+ ▀▄▄▀ ▀▄▄▄▄▀ ▄▀ ▄▀▀▀▀ ▄  ▀▀ ▀▄  
+  ▄ ▀▀ ▄▀▄▀ ▄      
+  ▀▀  ▀ ▀▀▀▀  ▀▀   ▄▀ 
+ ▀ ▀▀ ▀ ▀▄  ▄ ▄▀   
+      ▀▀▀▄▀     ▀ ▀▀ 
+ ▄▀▄▀          ▄ ▀▀▀ 
+ ▄▀      ▀       ▀▄▄  
+   ▀ ▀▄     ▀ ▀▄ ▀▄ ▀▀▄▄▄▄▀ 
+ ▀▀ ▀ ▀▄▀ ▀▀▀  ▀▀  
+ ▀▀▀▀▀▀ ▀▀▀▀▀▀ 
@@ -0,0 +1,23 @@
+$balloon5$
+ $\$
+ $\$
+ $\$
+  ▄▄ ▀▀▀▄▄▄ 
+ ▄▀   ▀▄▄▄     
+ ▄▀  ▀▀ ▄▀ ▄   
+   ▄    ▀  ▄▄ 
+     ▀ ▀▀▄ ▀ ▀   ▀▄ 
+      ▀▀  ▀▀   ▀▄ 
+ ▀ ▀  ▀   ▄ ▀▄   ▄▄▀▀▀▀▀▄▄ 
+  ▄  ▀ ▀▀▀ ▄▀▀ ▄▄▀ ▄▀▀ ▀▄ 
+ ▄▀ ▀▀▄▄▀ ▄   ▄ ▄▀▀▄▄▄▄▄▀ ▀▄
+ ▄▀ ▄▀▄ ▀ ▀ ▄▀ ▄▀▀▀ ▀  ▄▀▀▄  
+ ▀▀ ▀▀▀ ▀▀▀  ▀▄▄▀▀▀ ▀▀  ▀▄ ▄▀
+ ▀  ▀ ▀ ▀▄ ▀▄▀▄ ▀▀▀      
+ ▀  ▀▀▀▀▀▀▄       
+ ▀ ▀   ▀▀▀  ▀ ▀▀▄   ▄▀ 
+         ▀▄    ▀   
+           ▀▄   ▀▀  ▄ 
+ ▄▀▄▄     ▄▀ ▀   ▀▄▄ ▀▀  
+  ▀▀  ▀▄    ▀▀  ▀▄▄  ▀▀▀▀ 
+  ▀▀▀▀   ▀▀▀▀  
Oops, something went wrong.

0 comments on commit 38324c5

Please sign in to comment.