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

1 files changed, 0 insertions, 43 deletions

diff --git a/doc/uml/uml.prj b/doc/uml/uml.prj
deleted file mode 100644
index 078dae9e..00000000
--- a/doc/uml/uml.prj
+++ /dev/null
@@ -1,43 +0,0 @@
-format 70
-"uml"
-  revision 3
-  modified_by 2 "hut"
-
-
-  
-  // class settings
-  default_attribute_visibility private default_relation_visibility private default_operation_visibility public
-  //class diagram settings
-  draw_all_relations yes hide_attributes no hide_operations no hide_getset_operations no show_members_full_definition no show_members_visibility no show_members_stereotype no show_members_multiplicity no show_members_initialization no show_attribute_modifiers no member_max_width 127 show_parameter_dir yes show_parameter_name yes package_name_in_tab no class_drawing_mode natural drawing_language uml show_context_mode no auto_label_position yes show_relation_modifiers no show_relation_visibility no show_infonote no shadow yes show_stereotype_properties no
-  //use case diagram settings
-  package_name_in_tab no show_context no auto_label_position yes draw_all_relations yes class_drawing_mode actor shadow yes show_stereotype_properties no
-  //sequence diagram settings
-  show_full_operations_definition no write_horizontally yes class_drawing_mode natural drawing_language uml draw_all_relations yes shadow yes show_stereotype_properties no
-  //collaboration diagram settings
-  show_full_operations_definition no show_hierarchical_rank no write_horizontally yes drawing_language uml package_name_in_tab no show_context no draw_all_relations yes shadow yes show_stereotype_properties no
-  //object diagram settings
-   write_horizontally yes package_name_in_tab no show_context no auto_label_position yes draw_all_relations yes shadow yes show_stereotype_properties no
-  //component diagram settings
-  package_name_in_tab no show_context no auto_label_position yes draw_all_relations yes shadow yes
-  draw_component_as_icon no show_component_req_prov no show_component_rea no show_stereotype_properties no
-  //deployment diagram settings
-  package_name_in_tab no show_context no write_horizontally yes auto_label_position yes draw_all_relations yes shadow yes
-  draw_component_as_icon no show_component_req_prov no show_component_rea no show_stereotype_properties no
-  //state diagram settings
-  package_name_in_tab no show_context no auto_label_position yes write_trans_label_horizontally yes show_trans_definition no draw_all_relations yes shadow yes
-  show_activities yes region_horizontally yes drawing_language uml show_stereotype_properties no
-  //activity diagram settings
-  package_name_in_tab no show_context no show_opaque_action_definition no auto_label_position yes write_flow_label_horizontally no draw_all_relations yes shadow yes
-  show_infonote yes drawing_language uml show_stereotype_properties no
-  
-  class_color yellow duration_color transparent continuation_color gray note_color blue fragment_color transparent subject_color transparent usecase_color yellow package_color transparent component_color green artifact_color green deploymentnode_color gray state_color yellow stateaction_color transparent activity_color transparent activityregion_color transparent activitypartition_color transparent activityaction_color transparent parameterpin_color white 
-  font_size 13
-  diagram_format A4
-
-  mark_for_import
-  
-  package_ref 128002 // ranger
-
-  package_ref 134530 // builtin
-
-end