summary refs log tree commit diff stats
path: root/test
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-04-12 12:25:23 +0200
committerhut <hut@lavabit.com>2010-04-12 12:25:23 +0200
commit3cc9e8aa5592d370a0d355584a3716765531a439 (patch)
treecf772515d0c97b058f5613a5aee69ce4f3111cef /test
parent00b627921c0a493e064501f444fa69e147bbb59d (diff)
parent1019737b2570cebd09a2cdff29642085aa6d062e (diff)
downloadranger-3cc9e8aa5592d370a0d355584a3716765531a439.tar.gz
Merge branch 'master' into newkey
Conflicts:
	ranger/defaults/keys.py
	ranger/gui/widgets/console.py
Diffstat (limited to 'test')
0 files changed, 0 insertions, 0 deletions