diff options
author | hut <hut@lavabit.com> | 2013-02-24 15:45:08 +0100 |
---|---|---|
committer | hut <hut@lavabit.com> | 2013-02-24 15:45:08 +0100 |
commit | 3d8af3624e773371e6af58745daba096e77e5166 (patch) | |
tree | ea354a9d14d7288ce29741c198fdc092f623c971 /setup.py | |
parent | f29cf296420c257a55faaf485e3ef71f83ce6613 (diff) | |
parent | bf6a3d6d6c11a85c37322e713b3c7a6eb2a484fc (diff) | |
download | ranger-3d8af3624e773371e6af58745daba096e77e5166.tar.gz |
Merge branch 'vcs'
Conflicts: ranger/gui/widgets/__init__.py
Diffstat (limited to 'setup.py')
-rwxr-xr-x | setup.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/setup.py b/setup.py index 72f5db00..5d71cb53 100755 --- a/setup.py +++ b/setup.py @@ -28,4 +28,5 @@ if __name__ == '__main__': 'ranger.ext', 'ranger.fsobject', 'ranger.gui', - 'ranger.gui.widgets')) + 'ranger.gui.widgets', + 'ranger.ext.vcs')) |