diff options
| author | hut <hut@lavabit.com> | 2010-03-24 14:05:08 +0100 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2010-03-24 14:05:08 +0100 |
| commit | 55435343b142c424619e3072475ca8b3366d109c (patch) | |
| tree | 55c5ba8d815bd2d4cfca2086dba998eaebb83067 /doc/pydoc/ranger.defaults.html | |
| parent | efbde17048b14d43895e4cf91e798fb97702b68f (diff) | |
| parent | 0a16f0da970ae344f0094767c08995dd63f616cb (diff) | |
| download | ranger-55435343b142c424619e3072475ca8b3366d109c.tar.gz | |
Merge branch 'master' into newkey
Conflicts: ranger/api/keys.py ranger/container/commandlist.py ranger/core/actions.py ranger/defaults/keys.py ranger/gui/ui.py ranger/gui/widgets/browserview.py
Diffstat (limited to 'doc/pydoc/ranger.defaults.html')
| -rw-r--r-- | doc/pydoc/ranger.defaults.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/pydoc/ranger.defaults.html b/doc/pydoc/ranger.defaults.html index 454fec42..d0b18018 100644 --- a/doc/pydoc/ranger.defaults.html +++ b/doc/pydoc/ranger.defaults.html @@ -18,7 +18,8 @@ <tr><td bgcolor="#aa55cc"><tt> </tt></td><td> </td> <td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="ranger.defaults.apps.html">apps</a><br> +</td><td width="25%" valign=top><a href="ranger.defaults.commands.html">commands</a><br> </td><td width="25%" valign=top><a href="ranger.defaults.keys.html">keys</a><br> </td><td width="25%" valign=top><a href="ranger.defaults.options.html">options</a><br> -</td><td width="25%" valign=top></td></tr></table></td></tr></table> +</td></tr></table></td></tr></table> </body></html> \ No newline at end of file |