summary refs log tree commit diff stats
path: root/ranger
diff options
context:
space:
mode:
authorhut <hut@lepus.uberspace.de>2016-12-24 17:37:19 +0100
committerhut <hut@lepus.uberspace.de>2016-12-24 17:37:19 +0100
commitb707ba318007fcc995b6f6007acc49de0de2bd1d (patch)
treec8c8d682c3fde4aa1c202c5eab4c2ee74e4ec03d /ranger
parent0293c73b5d2e9ffaa0559e78b17147b599fd3511 (diff)
parent3c65273e144300062b7eed5797641a9e6afc4229 (diff)
downloadranger-b707ba318007fcc995b6f6007acc49de0de2bd1d.tar.gz
Merge branch 'stable'
Diffstat (limited to 'ranger')
-rw-r--r--ranger/__init__.py4
-rwxr-xr-xranger/ext/rifle.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/ranger/__init__.py b/ranger/__init__.py
index 9c4f8922..72a8f6e0 100644
--- a/ranger/__init__.py
+++ b/ranger/__init__.py
@@ -14,7 +14,7 @@ import tempfile
 
 # Information
 __license__ = 'GPL3'
-__version__ = '1.7.2'
+__version__ = '1.8.0'
 __author__ = __maintainer__ = 'Roman Zimbelmann'
 __email__ = 'hut@hut.pm'
 
@@ -27,7 +27,7 @@ MACRO_DELIMITER = '%'
 DEFAULT_PAGER = 'less'
 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
diff --git a/ranger/ext/rifle.py b/ranger/ext/rifle.py
index f5a492b6..a9de6a2a 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.2'
+__version__ = 'rifle 1.8.0'
 
 # Options and constants that a user might want to change:
 DEFAULT_PAGER = 'less'