Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix bad merge
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Wed, 31 Mar 2010 17:02:51 +0200
changeset 5125 eaec839ad3fe
parent 5121 a63d7886fcf5
child 5155 1dea6e0fdfc1
fix bad merge
__pkginfo__.py file | annotate | diff | comparison | revisions 
--- a/__pkginfo__.py	Wed Mar 31 15:39:09 2010 +0200
+++ b/__pkginfo__.py	Wed Mar 31 17:02:51 2010 +0200
@@ -95,9 +95,9 @@
          [join(_data_dir, fname) for fname in listdir(_data_dir)
           if not isdir(join(_data_dir, fname))]],
         [join('share', 'cubicweb', 'cubes', 'shared', 'data', 'timeline'),
-         [join(data_dir, 'timeline', fname) for fname in listdir(join(data_dir, 'timeline'))]],
+         [join(_data_dir, 'timeline', fname) for fname in listdir(join(_data_dir, 'timeline'))]],
         [join('share', 'cubicweb', 'cubes', 'shared', 'data', 'images'),
-         [join(data_dir, 'images', fname) for fname in listdir(join(data_dir, 'images'))]],
+         [join(_data_dir, 'images', fname) for fname in listdir(join(_data_dir, 'images'))]],
         [join('share', 'cubicweb', 'cubes', 'shared', 'wdoc'),
          [join(_wdoc_dir, fname) for fname in listdir(_wdoc_dir)
           if not isdir(join(_wdoc_dir, fname))]],
cubicweb