Merge heads

12e78706 · Serhiy Storchaka · 58f9b57b · e2fbf4fa · 12e78706 · 12e78706
Commit 12e78706 authored Jul 23, 2014 by Serhiy Storchaka
Expand all Show whitespace changes
Inline Side-by-side

Showing with 93 additions and 75 deletions

Demo/turtle/turtleDemo.py Demo/turtle/turtleDemo.py +92 -75

Misc/ACKS Misc/ACKS +1 -0

No files found.
--- a/Demo/turtle/turtleDemo.py
+++ b/Demo/turtle/turtleDemo.py
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -662,6 +662,7 @@ Kurt B. Kaiser
 Tamito Kajiyama
 Jan Kaliszewski
 Peter van Kampen
+Jan Kanis
 Rafe Kaplan
 Jacob Kaplan-Moss
 Janne Karila