Merge branch '0.4.2'

callowayproject · Jun 8, 2011 · fbdc097 · fbdc097
2 parents 8442ee5 + ba7f3cb
commit fbdc097
Show file tree

Hide file tree

Showing 1,841 changed files with 18 additions and 2,079 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@ media/css/*.r*.css
 externals
 MANIFEST
 dist/
+.*
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -3,7 +3,7 @@ recursive-include docs *
 
 recursive-include calloway/apps *.txt *.py
 recursive-include calloway/bin *.sh
-recursive-include calloway/media *.html *.gif *.png *.css *.txt
+recursive-include calloway/static *.html *.gif *.png *.css *.txt *.js
 recursive-include calloway/templates *.html *.xml
 
 include LICENSE

diff --git a/calloway/__init__.py b/calloway/__init__.py
@@ -1,7 +1,7 @@
 __version_info__ = {
     'major': 0,
     'minor': 4,
-    'micro': 1,
+    'micro': 2,
     'releaselevel': 'final',
     'serial': 1
 }

diff --git a/calloway/media/js/tiny_mce/plugins/media/css/content.css b/calloway/media/js/tiny_mce/plugins/media/css/content.css
diff --git a/calloway/media/js/tiny_mce/plugins/media/css/media.css b/calloway/media/js/tiny_mce/plugins/media/css/media.css
diff --git a/calloway/media/js/tiny_mce/plugins/media/editor_plugin.js b/calloway/media/js/tiny_mce/plugins/media/editor_plugin.js