summary refs log tree commit diff stats
path: root/doc/pydoc/ranger.ext.html
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-04-07 15:50:08 +0200
committerhut <hut@lavabit.com>2010-04-07 15:50:08 +0200
commit8d89c6f3a7cf6b0c8abc2ff68ecc7201ac08e872 (patch)
tree610dd3acfdac10ebe1d766a779897207ea6dfb33 /doc/pydoc/ranger.ext.html
parent55435343b142c424619e3072475ca8b3366d109c (diff)
parentf45f9734d2ff9fd6b68ff6c879d5b07b0e5c7d02 (diff)
downloadranger-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/ranger.ext.html')
-rw-r--r--doc/pydoc/ranger.ext.html3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/pydoc/ranger.ext.html b/doc/pydoc/ranger.ext.html
index d58c1b87..a625bf53 100644
--- a/doc/pydoc/ranger.ext.html
+++ b/doc/pydoc/ranger.ext.html
@@ -29,6 +29,7 @@
 <a href="ranger.ext.openstruct.html">openstruct</a><br>
 <a href="ranger.ext.shell_escape.html">shell_escape</a><br>
 <a href="ranger.ext.shutil_generatorized.html">shutil_generatorized</a><br>
-</td><td width="25%" valign=top><a href="ranger.ext.waitpid_no_intr.html">waitpid_no_intr</a><br>
+</td><td width="25%" valign=top><a href="ranger.ext.signal_dispatcher.html">signal_dispatcher</a><br>
+<a href="ranger.ext.waitpid_no_intr.html">waitpid_no_intr</a><br>
 </td></tr></table></td></tr></table>
 </body></html>
\ No newline at end of file