(to fix merge)

2012-01-24 16:39:30 -05:00 · 2012-01-24 16:39:30 -05:00 · 886ce2b6d6
parent 92952d5e4e 783687aeb3
commit 886ce2b6d6
2 changed files with 6 additions and 1 deletions
--- a/6
+++ b/6
@ -2,8 +2,12 @@ Package: lightningbeam
 Version: 1.0.0-alpha2
 Section: graphics
 Priority: optional
-Architecture: any
+Architecture: all
 Installed-size: 27000
+<<<<<<< HEAD
 Depends: bash, python, libc
+=======
+Depends: bash, python, python-imaging
+>>>>>>> 783687aeb3bb92c515f31f44b919bb0102d64d2f
 Maintainer: skycooler@gmail.com
 Description: Lightningbeam is an open-source animated content creation tool.
--- a/svlgui.py
+++ b/svlgui.py
@ -1113,6 +1113,7 @@ class Shape (object):
 		self.shapedata=[]
 		self.filled=False
 		self.type="Shape"
+		self.iname = None
 		####################-----TEMPORARY-----#########################
 		self.name = "s"+str(int(random.random()*10000))+str(SITER)
 		SITER+=1