Merge branch 'master' into develop

erkin · Aug 19, 2012 · 4774e74 · 4774e74
2 parents f763439 + 64b7267
commit 4774e74
Show file tree

Hide file tree

Showing 341 changed files with 1,427 additions and 1,096 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,10 @@
 
 /completion/*-completion-think.*
 /manuals/manpage.*.gz
+/ponysay.info
 /ponysay.info.gz
 /truncater
 *.install
+/Makefile
+/quotes/
+
diff --git a/.gitmodules b/.gitmodules
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,12 @@
+Version 2.0
+
+	Makefile is generated by running `./configure`.
+
+	All Perl scripts and almost all Bash are reimplemented in one Python 3 script.
+
+	kmsponies4ponysay is included.
+
+
 Version 1.4.1
 
 	Code is repaired and more portable.

diff --git a/CREDITS b/CREDITS
@@ -3,12 +3,12 @@
 # Active developers
 Erkin Batu Altunbaş
 Mattias Andrée
+Elis Axelsson
 Sven-Hendrik Haase
 Pablo Lezaeta
 Jan Alexander Steffens
 
 # Patchers and other contributors
-Elis Axelsson
 Duane Bekaert
 Kyah Rindlisbacher
 James Ross-Gowan

diff --git a/Makefile b/Makefile