diff options
| author | hut <hut@lavabit.com> | 2010-10-08 17:58:18 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2010-10-08 17:58:18 +0200 |
| commit | 0ff9e377ec42c206631a3a14eb2b6beb6f7974d3 (patch) | |
| tree | 22ffe5563e9e32055932a46dc299df07cb7b359c /COPYING | |
| parent | 2a8ba97dc9f883dc61a3ab083747c20c0385eb88 (diff) | |
| parent | 6615467cb849207dd98fd307e4cc217cd05c9f09 (diff) | |
| download | ranger-0ff9e377ec42c206631a3a14eb2b6beb6f7974d3.tar.gz | |
Merge branch 'master' into cp
Conflicts: ranger/__init__.py ranger/core/fm.py ranger/core/main.py ranger/core/helper.py ranger/core/loader.py
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions