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 /doc/pydoc/test.html | |
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 'doc/pydoc/test.html')
-rw-r--r-- | doc/pydoc/test.html | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/pydoc/test.html b/doc/pydoc/test.html index 2a0ce426..69b6f644 100644 --- a/doc/pydoc/test.html +++ b/doc/pydoc/test.html @@ -38,8 +38,9 @@ <a href="test.tc_ext.html">tc_ext</a><br> </td><td width="25%" valign=top><a href="test.tc_history.html">tc_history</a><br> <a href="test.tc_keyapi.html">tc_keyapi</a><br> -<a href="test.tc_ui.html">tc_ui</a><br> -</td><td width="25%" valign=top><a href="test.test.html">test</a><br> +<a href="test.tc_signal.html">tc_signal</a><br> +</td><td width="25%" valign=top><a href="test.tc_ui.html">tc_ui</a><br> +<a href="test.test.html">test</a><br> </td></tr></table></td></tr></table><p> <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section"> <tr bgcolor="#55aa55"> @@ -47,5 +48,5 @@ <font color="#ffffff" face="helvetica, arial"><big><strong>Data</strong></big></font></td></tr> <tr><td bgcolor="#55aa55"><tt> </tt></td><td> </td> -<td width="100%"><strong>__all__</strong> = ['tc_keyapi', 'tc_history', 'tc_directory', 'tc_colorscheme', 'tc_commandlist', 'tc_displayable', 'tc_ui', 'tc_bookmarks', 'tc_ext']</td></tr></table> +<td width="100%"><strong>__all__</strong> = ['tc_keyapi', 'tc_history', 'tc_colorscheme', 'tc_bookmarks', 'tc_ext', 'tc_directory', 'tc_commandlist', 'tc_colorscheme', 'tc_keyapi', 'tc_history', 'tc_commandlist', 'tc_signal', 'tc_displayable', 'tc_signal', 'tc_directory', 'tc_ui', 'tc_ui', 'tc_bookmarks', 'tc_ext', 'tc_displayable']</td></tr></table> </body></html> \ No newline at end of file |