changeset 251:044d302379ad

Merged changes.
author Ludovic Chabant <ludovic@chabant.com>
date Sun, 30 Mar 2014 23:36:48 -0700
parents 7160ab8d31fb (diff) 4d525dab3e1b (current diff)
children f809a9ea60ff
files
diffstat 3 files changed, 8 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sun Mar 30 23:27:44 2014 -0700
+++ b/.hgtags	Sun Mar 30 23:36:48 2014 -0700
@@ -2,3 +2,4 @@
 bcbe934eab29db1f5e6b45517827d560c092bf38 0.3.0
 3580410865fe827683ba3338fd10ab2a11a31a95 0.4.0
 729fa268c981f445273bff3d242aea94078dfc6c 0.4.1
+9055434ebbd07eb3be5ef9b28d22c332c741dc08 0.4.2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MANIFEST.in	Sun Mar 30 23:36:48 2014 -0700
@@ -0,0 +1,7 @@
+recursive-include wikked/resources *
+include wikked/templates/*.html
+include wikked/static/bootstrap/fonts/*
+include wikked/static/css/wikked.min.css
+include wikked/static/img/*.png
+include wikked/static/js/require.js
+include wikked/static/js/wikked.min.js
--- a/setup.py	Sun Mar 30 23:27:44 2014 -0700
+++ b/setup.py	Sun Mar 30 23:36:48 2014 -0700
@@ -88,19 +88,6 @@
             'repoze.lru==0.6',
             'python-hglib'],
         include_package_data=True,
-        package_data={
-            'wikked': [
-                'resources/defaults.cfg',
-                'resources/hg_log.style',
-                'resources/init/*',
-                'templates/*.html',
-                'static/bootstrap/fonts/*',
-                'static/css/wikked.min.css',
-                'static/img/*.png',
-                'static/js/require.js',
-                'static/js/wikked.min.js'
-                ]
-            },
         zip_safe=False,
         classifiers=[
                 'Development Status :: 3 - Alpha',