Initial commit v1.7.1

6 files changed, 13 insertions, 6 deletions

diff --git a/CHANGELOG b/CHANGELOG
index e52316e4..28bcfda6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,12 @@
 This log documents changes between stable versions.
 
+2015-05-04: version 1.7.1
+* Added doc/cheatsheet.svg
+* Added examples/rc_emacs.conf, a config file adding emacs-like key bindings
+* Added "env" keyword in rifle.conf
+* Fixed ":bulkrename" command in python3
+* Fixed "S" key binding not working when SHELL=fish
+
 2015-04-13: version 1.7.0
 * The default editor is now "vim" instead of "nano"
 * Added automatic updates of tags when a file is renamed from within ranger
diff --git a/README.md b/README.md
index b5e42455..75ef2ea0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-ranger v.1.7.0
+ranger v.1.7.1
 ==============
 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 e7f64add..42eca7e6 100644
--- a/doc/ranger.1
+++ b/doc/ranger.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RANGER 1"
-.TH RANGER 1 "ranger-1.7.0" "04/13/2015" "ranger manual"
+.TH RANGER 1 "ranger-1.7.1" "05/04/2015" "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/doc/rifle.1 b/doc/rifle.1
index 95010452..3bb74dd8 100644
--- a/doc/rifle.1
+++ b/doc/rifle.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RIFLE 1"
-.TH RIFLE 1 "rifle-1.7.0" "04/13/2015" "rifle manual"
+.TH RIFLE 1 "rifle-1.7.1" "05/04/2015" "rifle 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 1712c83e..1a9dad68 100644
--- a/ranger/__init__.py
+++ b/ranger/__init__.py
@@ -13,7 +13,7 @@ import os
 
 # Information
 __license__ = 'GPL3'
-__version__ = '1.7.0'
+__version__ = '1.7.1'
 __author__ = __maintainer__ = 'Roman Zimbelmann'
 __email__ = 'hut@hut.pm'
 
@@ -27,7 +27,7 @@ DEFAULT_PAGER = 'less'
 LOGFILE = '/tmp/ranger_errorlog'
 CACHEDIR = os.path.expanduser("~/.cache/ranger")
 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.
diff --git a/ranger/ext/rifle.py b/ranger/ext/rifle.py
index 55db2a54..4f1ef1b9 100755
--- a/ranger/ext/rifle.py
+++ b/ranger/ext/rifle.py
@@ -19,7 +19,7 @@ import re
 from subprocess import Popen, PIPE
 import sys
 
-__version__ = 'rifle 1.7.0'
+__version__ = 'rifle 1.7.1'
 
 # Options and constants that a user might want to change:
 DEFAULT_PAGER = 'less'