summary refs log tree commit diff stats
path: root/test/tc_displayable.py
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-04-14 00:24:10 +0200
committerhut <hut@lavabit.com>2010-04-14 00:24:10 +0200
commit04ce666a809f461db7477edc7884beb4d466deff (patch)
tree1c6785fe6a989e723781e2bcce9426a60123b2a5 /test/tc_displayable.py
parentdaa224d86348f0e0fa39d09feef43e34df56d780 (diff)
parent19c1fa4f622ffd1597943f0005ba58a30b170bb4 (diff)
downloadranger-04ce666a809f461db7477edc7884beb4d466deff.tar.gz
Merge branch 'devel' into newkey
Conflicts:
	ranger/__main__.py
	ranger/defaults/keys.py
	ranger/gui/widgets/console.py
Diffstat (limited to 'test/tc_displayable.py')
0 files changed, 0 insertions, 0 deletions