Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWalter Bender <walter.bender@gmail.com>2013-04-01 17:44:49 (GMT)
committer Walter Bender <walter.bender@gmail.com>2013-04-01 17:44:49 (GMT)
commit9c38b6758cbed458826e1ec7d801ea09aa5e606d (patch)
tree07b28c78cc7e035eb96eaf6073275cab9fd27fff
parent8e9b9cccef520fa80a977b1cf95c1d3799c88b04 (diff)
parent2c4b6436058c975d77c8c318cf85fb2afc45145f (diff)
Merge branch 'master' of git.sugarlabs.org:turtleart/mainline
-rw-r--r--.arcconfig4
-rw-r--r--.gitignore1
-rw-r--r--TurtleArtActivity.py2
3 files changed, 5 insertions, 2 deletions
diff --git a/.arcconfig b/.arcconfig
new file mode 100644
index 0000000..4c2c94f
--- /dev/null
+++ b/.arcconfig
@@ -0,0 +1,4 @@
+{
+ "project_id" : "turtleart",
+ "conduit_uri" : "http://phabricator.itevenworks.net/"
+}
diff --git a/.gitignore b/.gitignore
index 737cf64..f3d74a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
*.pyc
*~
-*.pyo
diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index 65b176c..2583a0c 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#Copyright (c) 2007, Playful Invention Company
#Copyright (c) 2008-13, Walter Bender
-#Copyright (c) 2009-10 Raul Gutierrez Segales
+#Copyright (c) 2009-13 Raul Gutierrez Segales
#Copyright (c) 2012 Alan Aguiar
#Permission is hereby granted, free of charge, to any person obtaining a copy