diff options
| author | hut <hut@lavabit.com> | 2010-04-18 01:00:42 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2010-04-18 01:00:42 +0200 |
| commit | 7a488bda9f0b49ae40e62960a2d7804c43f90e6e (patch) | |
| tree | 2d0e86e88eed20fade817043e453475cf7116768 /doc | |
| parent | 5382110c61dda98d88ca6b18cd7739f8e911f22f (diff) | |
| parent | c2238598bfb590367f6c52c4fcbf43d02148a523 (diff) | |
| download | ranger-7a488bda9f0b49ae40e62960a2d7804c43f90e6e.tar.gz | |
Merge branch 'master' into devel
Conflicts: ranger/gui/ui.py ranger/gui/widgets/console.py ranger/gui/widgets/pager.py ranger/gui/widgets/taskview.py ranger/shared/settings.py
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions