From b36c04794424944e0a87bc6f7df47f760a96e683 Mon Sep 17 00:00:00 2001
From: hut <hut@lavabit.com>
Date: Fri, 22 Feb 2013 23:36:30 +0100
Subject: Fire in the Hole!

---
 CHANGELOG          | 38 ++++++++++++++++++++++++++++++++++++++
 README             |  2 +-
 doc/ranger.1       |  2 +-
 ranger/__init__.py |  4 ++--
 4 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 03f3f03b..48651d77 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,43 @@
 This log documents changes between stable versions.
 
+2013-02-22: Version 1.6.0
+* Overhauled all config files.  Please update them or use the --clean switch
+* Added "examples/" directory to source code which contains sample programs or
+  plugins that can be used together with ranger
+* Added progress bars to copying, moving and directory loading processes
+* Added feature to draw images inside the console using w3mimgdisplay (you need
+  to add "set preview_images true" in rc.conf)
+* Added a plugin system like in the program "anki", i.e. place any python file
+  into ~/.config/ranger/plugins/ and it will be imported by ranger
+* Added a separate file launcher named "rifle" that is configured through
+  rifle.conf and is installed as a standalone program.
+  Using "ranger [filename]" from the shell for opening files is deprecated now,
+  please use "rifle [filename]" instead.
+* Added "uq" keybinding to undo closed tabs
+* Added :setlocal command to change settings for specific directories only
+* Added :travel command to move more quickly to your destination
+* Added 256 color support for scope.sh
+* Added a real yes/no prompt for :delete command
+* Added settings: confirm_on_delete, draw_progress_bar_in_status_bar,
+  preview_images, status_bar_on_top, update_tmux_title
+* Added commands: :mark_tag, :unmark_tag
+* Added BSD-friendly setsid implementation
+* Added as-you-type filtering for :filter command
+* Replaced "options.py" file by :set commands in rc.conf
+* Replaced "apps.py" file with rifle.conf
+* Improved "r" key to interface with rifle
+* Rewritten "scope.sh" in POSIX shell
+* Changed copying/moving code to work without GNU coreutils
+* Changed key to untag files from "T" to "ut"
+* Changed the flag "d" (for detached) to "f" (for fork) in program launcher
+* Changed appearance of keybinding-hints and bookmarks
+* Changed tabs with 4 spaces in the source code (see PEP 8)
+* Removed ranger.core.environment class
+* Removed settings: colorscheme_overlay, draw_bookmark_borders, init_function,
+  load_default_rc
+* Fixed zombie process apocalypse
+* Fixed draw_borders=true in combination with padding_right=false
+
 2012-08-10: Version 1.5.5
 * Ensure that detached programs continue to run when ranger is killed
 
diff --git a/README b/README
index f1708257..3f5db9ee 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-ranger v.1.5.5
+ranger v.1.6.0
 ==============
 ranger is a console file manager with VI key bindings.  It provides a
 minimalistic and nice curses interface with a view on the directory hierarchy.
diff --git a/doc/ranger.1 b/doc/ranger.1
index e18ec5d0..d23b96fd 100644
--- a/doc/ranger.1
+++ b/doc/ranger.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RANGER 1"
-.TH RANGER 1 "ranger-1.5.5" "02/22/2013" "ranger manual"
+.TH RANGER 1 "ranger-1.6.0" "02/22/2013" "ranger manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/ranger/__init__.py b/ranger/__init__.py
index da6b234c..2a6f9696 100644
--- a/ranger/__init__.py
+++ b/ranger/__init__.py
@@ -13,7 +13,7 @@ import os
 
 # Information
 __license__ = 'GPL3'
-__version__ = '1.5.5'
+__version__ = '1.6.0'
 __author__ = __maintainer__ = 'Roman Zimbelmann'
 __email__ = 'hut@lavabit.com'
 
@@ -26,7 +26,7 @@ MACRO_DELIMITER = '%'
 DEFAULT_PAGER = 'less'
 LOGFILE = '/tmp/ranger_errorlog'
 USAGE = '%prog [options] [path]'
-VERSION = 'ranger-master %s\n\nPython %s' % (__version__, sys.version)
+VERSION = 'ranger-stable %s\n\nPython %s' % (__version__, sys.version)
 
 # If the environment variable XDG_CONFIG_HOME is non-empty, CONFDIR is ignored
 # and the configuration directory will be $XDG_CONFIG_HOME/ranger instead.
-- 
cgit 1.4.1-2-gfad0