summary refs log tree commit diff stats
path: root/CHANGELOG
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-10-08 17:58:18 +0200
committerhut <hut@lavabit.com>2010-10-08 17:58:18 +0200
commit0ff9e377ec42c206631a3a14eb2b6beb6f7974d3 (patch)
tree22ffe5563e9e32055932a46dc299df07cb7b359c /CHANGELOG
parent2a8ba97dc9f883dc61a3ab083747c20c0385eb88 (diff)
parent6615467cb849207dd98fd307e4cc217cd05c9f09 (diff)
downloadranger-0ff9e377ec42c206631a3a14eb2b6beb6f7974d3.tar.gz
Merge branch 'master' into cp
Conflicts:
	ranger/__init__.py
	ranger/core/fm.py
	ranger/core/main.py
	ranger/core/helper.py
	ranger/core/loader.py
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f1417fee..8078305d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,9 @@ This log only documents changes between stable versions.
 From 1.2 on, odd minor version numbers (1.3, 1.5, 1.7,..) are assigned to the
 fresh git snapshots while stable versions will have even minor numbers.
 
+1.2 -> 1.2.1:
+* Fixed yy/pp bug when yanking multiple directories
+
 1.1.2 -> 1.2:
 * !!! Changed the default configuration directory to ~/.config/ranger !!!
 * Removed "Console Modes", each old mode is now a simple command