diff options
| author | hut <hut@lavabit.com> | 2010-04-14 19:47:34 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2010-04-14 19:47:34 +0200 |
| commit | 681d9f6adf185f1c3adf0801da3d3baac99e1ea7 (patch) | |
| tree | afc0426eb645d9edf46ff9704e8d268bae66bc87 /ranger.py | |
| parent | eba109b0ed0bf5fd6a39153d67c6150e56d988fb (diff) | |
| parent | 1d3d94aac68790581e1e4027d0ecc868c516fea1 (diff) | |
| download | ranger-681d9f6adf185f1c3adf0801da3d3baac99e1ea7.tar.gz | |
Merge branch 'master' into devel
Conflicts: ranger/gui/widgets/browsercolumn.py
Diffstat (limited to 'ranger.py')
0 files changed, 0 insertions, 0 deletions