Merge remote-tracking branch 'eole/master'

2012-07-23 15:26:11 +02:00 · 2012-07-23 15:26:11 +02:00 · d758d4e1f7
parent bdb6c68c54 6118db13e4
commit d758d4e1f7
2 changed files with 1 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,4 @@
 *~
 *#
+*.pyc
 build/
--- a/setup.py
+++ b/setup.py
@ -9,6 +9,5 @@ setup(
    version='1.0',
    description='configuration management tool',
    url='http://labs.libre-entreprise.org/projects/tiramisu',
-    package_dir = {'tiramisu':'tiramisu'},
    packages=['tiramisu']
 )