diff options
| author | hut <hut@lavabit.com> | 2010-10-08 19:46:41 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2010-10-08 19:46:41 +0200 |
| commit | 8e0d73b53f164f949b55e268d9c76f0531b8c7d8 (patch) | |
| tree | bf4f8ce8545f69d208b2b962ee2daa0c18c78947 /Makefile | |
| parent | d56375f95f91b9670a2353ee8d8883eca5c35f1e (diff) | |
| parent | 3668fb2c70524a4f3e988cc4760e319500f9a4fb (diff) | |
| download | ranger-8e0d73b53f164f949b55e268d9c76f0531b8c7d8.tar.gz | |
Merge branch 'master' into preview
Conflicts: ranger/__init__.py ranger/core/helper.py ranger/gui/curses_shortcuts.py
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions