diff options
author | hut <hut@lavabit.com> | 2012-08-10 16:20:00 +0200 |
---|---|---|
committer | hut <hut@lavabit.com> | 2012-08-10 16:20:00 +0200 |
commit | 60dcf60ac6c113faeb02ef7f6afdd0a39cd554d7 (patch) | |
tree | 3c84ad570ca947fdc12757103f642c08e34fd06b /doc | |
parent | 8bd08cae83e091dce189ab8c84db468631c58e13 (diff) | |
parent | 60a6b7e639666051e8b7288b932498b19c299a00 (diff) | |
download | ranger-60dcf60ac6c113faeb02ef7f6afdd0a39cd554d7.tar.gz |
Merge branch 'stable'
Conflicts: doc/ranger.1 ranger/defaults/apps.py
Diffstat (limited to 'doc')
-rw-r--r-- | doc/ranger.1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ranger.1 b/doc/ranger.1 index f199c67e..cfdbd455 100644 --- a/doc/ranger.1 +++ b/doc/ranger.1 @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "RANGER 1" -.TH RANGER 1 "ranger-1.5.4" "08/02/2012" "ranger manual" +.TH RANGER 1 "ranger-1.5.5" "08/10/2012" "ranger manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l |