Merge branch 'master' into android-support

2012-01-22 21:01:33 +01:00 · 2012-01-22 21:01:33 +01:00 · 3550efb49f
parent 54f03f2c2b a1922b6252
commit 3550efb49f
2 changed files with 2 additions and 1 deletions
--- a/MANIFEST.in
+++ b/MANIFEST.in
@ -1,7 +1,7 @@
 include *AUTHORS *COPYING
 recursive-include doc *
 recursive-include examples *
-recursive-include kivy/data *.png *.jpg *.svg *.css *.ttf *.kv *.fs *.vs *.json *.gif
+recursive-include kivy/data *.png *.jpg *.svg *.css *.ttf *.kv *.fs *.vs *.json *.gif *.atlas
 recursive-include kivy/tools *.png *.txt *.bat *.sh *.py
 recursive-include kivy/tests *.py *.png
 recursive-include kivy *.pyd *.pyx *.c *.pxi *.h *.pxd
--- a/setup.py
+++ b/setup.py
@ -259,6 +259,7 @@ setup(
        'data/images/*.png',
        'data/images/*.jpg',
        'data/images/*.gif',
+        'data/images/*.atlas',
        'data/keyboards/*.json',
        'data/logo/*.png',
        'data/glsl/*.png',