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

2015-04-21 23:05:31 -07:00
parent 39302eaeca 1b71d12d0a
commit ba9459da7b
23 changed files with 18 additions and 6 deletions
--- a/desktop/resources/dream/Untitled-4.psd
+++ b/desktop/resources/dream/Untitled-4.psd
--- a/desktop/resources/ego/love.png
+++ b/desktop/resources/ego/love.png
--- a/desktop/resources/ego/love.pxa/10.pxi
+++ b/desktop/resources/ego/love.pxa/10.pxi
--- a/desktop/resources/ego/love.pxa/11.pxi
+++ b/desktop/resources/ego/love.pxa/11.pxi
--- a/desktop/resources/ego/love.pxa/12.pxi
+++ b/desktop/resources/ego/love.pxa/12.pxi
--- a/desktop/resources/ego/love.pxa/13.pxi
+++ b/desktop/resources/ego/love.pxa/13.pxi
--- a/desktop/resources/ego/love.pxa/14.pxi
+++ b/desktop/resources/ego/love.pxa/14.pxi
--- a/desktop/resources/ego/love.pxa/15.pxi
+++ b/desktop/resources/ego/love.pxa/15.pxi
--- a/desktop/resources/ego/love.pxa/16.pxi
+++ b/desktop/resources/ego/love.pxa/16.pxi
--- a/desktop/resources/ego/love.pxa/17.pxi
+++ b/desktop/resources/ego/love.pxa/17.pxi
--- a/desktop/resources/ego/love.pxa/18.pxi
+++ b/desktop/resources/ego/love.pxa/18.pxi
--- a/desktop/resources/ego/love.pxa/19.pxi
+++ b/desktop/resources/ego/love.pxa/19.pxi
--- a/desktop/resources/ego/love.pxa/20.pxi
+++ b/desktop/resources/ego/love.pxa/20.pxi
--- a/desktop/resources/ego/love.pxa/21.pxi
+++ b/desktop/resources/ego/love.pxa/21.pxi
--- a/desktop/resources/ego/love.pxa/22.pxi
+++ b/desktop/resources/ego/love.pxa/22.pxi
--- a/desktop/resources/ego/love.pxa/23.pxi
+++ b/desktop/resources/ego/love.pxa/23.pxi
--- a/desktop/resources/ego/love.pxa/24.pxi
+++ b/desktop/resources/ego/love.pxa/24.pxi
--- a/desktop/resources/ego/love.pxa/25.pxi
+++ b/desktop/resources/ego/love.pxa/25.pxi
--- a/desktop/resources/ego/love.pxa/9.pxi
+++ b/desktop/resources/ego/love.pxa/9.pxi
--- a/desktop/resources/ego/love.pxa/CelData.plist
+++ b/desktop/resources/ego/love.pxa/CelData.plist
@@ -98,5 +98,13 @@
 		<key>duration</key>
 		<real>1</real>
 	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
 </array>
 </plist>