diff options
author | Luke Macken <lmacken@redhat.com> | 2011-04-12 21:35:04 -0400 |
---|---|---|
committer | Luke Macken <lmacken@redhat.com> | 2011-04-12 21:35:04 -0400 |
commit | ef0f36eee50df5081280edd069ff452573c0f679 (patch) | |
tree | 91fb6c62687d2c3c5107e3dc8c97cc2819768792 /.gitignore | |
parent | 79380e187bfa4b1ee5db7f017adb9c6fae3b13ad (diff) | |
parent | 13d9a8971b2a0113ee4535e5a6f3e644032cb8fe (diff) | |
download | leafymiracle-ef0f36eee50df5081280edd069ff452573c0f679.tar.gz leafymiracle-ef0f36eee50df5081280edd069ff452573c0f679.tar.xz leafymiracle-ef0f36eee50df5081280edd069ff452573c0f679.zip |
Merge branch 'dependencies'
Conflicts:
.gitignore
README.txt
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,9 +1,10 @@ *.pyc *.pyo -*.db +*.db* build dist env *.egg-info *.swp README.pdf +comps |