Merge branch 'master' of https://bitbucket.org/brycecovertoperations/advent

2014-11-19 12:37:10 -08:00
parent 4feef026a3 97f2a05be9
commit 47deaacbac
11 changed files with 24 additions and 5 deletions
--- a/desktop/resources/cursor.png
+++ b/desktop/resources/cursor.png
--- a/desktop/resources/ego/grow.png
+++ b/desktop/resources/ego/grow.png
--- a/desktop/resources/ego/grow.pxa/1.pxi
+++ b/desktop/resources/ego/grow.pxa/1.pxi
--- a/desktop/resources/ego/grow.pxa/2.pxi
+++ b/desktop/resources/ego/grow.pxa/2.pxi
--- a/desktop/resources/ego/grow.pxa/3.pxi
+++ b/desktop/resources/ego/grow.pxa/3.pxi
--- a/desktop/resources/ego/grow.pxa/4.pxi
+++ b/desktop/resources/ego/grow.pxa/4.pxi
--- a/desktop/resources/ego/grow.pxa/CelData.plist
+++ b/desktop/resources/ego/grow.pxa/CelData.plist
@@ -18,5 +18,9 @@
 		<key>duration</key>
 		<real>1</real>
 	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
 </array>
 </plist>