diff options
| author | hut <hut@lavabit.com> | 2010-04-07 15:50:08 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2010-04-07 15:50:08 +0200 |
| commit | 8d89c6f3a7cf6b0c8abc2ff68ecc7201ac08e872 (patch) | |
| tree | 610dd3acfdac10ebe1d766a779897207ea6dfb33 /test/test.py | |
| parent | 55435343b142c424619e3072475ca8b3366d109c (diff) | |
| parent | f45f9734d2ff9fd6b68ff6c879d5b07b0e5c7d02 (diff) | |
| download | ranger-8d89c6f3a7cf6b0c8abc2ff68ecc7201ac08e872.tar.gz | |
Merge branch 'devel' into newkey
Conflicts: ranger/core/actions.py ranger/defaults/keys.py ranger/ext/direction.py ranger/gui/ui.py ranger/gui/widgets/browserview.py ranger/gui/widgets/pager.py
Diffstat (limited to 'test/test.py')
0 files changed, 0 insertions, 0 deletions