# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1396247808 25200
# Node ID 044d302379add0a4728f6900137ed477ec04214b
# Parent  7160ab8d31fb1f6478534cc7ae8a7ab82488c004# Parent  4d525dab3e1b5be8ac6a83787b01c0cb4cd98bfc
Merged changes.

diff -r 4d525dab3e1b -r 044d302379ad .hgtags
--- 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
diff -r 4d525dab3e1b -r 044d302379ad MANIFEST.in
--- /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
diff -r 4d525dab3e1b -r 044d302379ad setup.py
--- 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',