summary refs log tree commit diff stats
path: root/scripts/rifle
diff options
context:
space:
mode:
authorhut <hut@lepus.uberspace.de>2014-12-05 16:10:56 +0100
committerhut <hut@lepus.uberspace.de>2014-12-05 16:10:56 +0100
commit5b6901f8067d783fd3e91efe32553339b4746c52 (patch)
tree346dd4c4b421d7800b05431dc0a38cb7643199c3 /scripts/rifle
parent807402c260afede5822c6c5edcf6b9f40d11ef86 (diff)
parent2e7f35a52f0ab0d6402df26a59573218552518a4 (diff)
downloadranger-5b6901f8067d783fd3e91efe32553339b4746c52.tar.gz
Merge branch 'flat_command' of https://github.com/tex/ranger
Conflicts:
	ranger/container/fsobject.py
	ranger/gui/widgets/browsercolumn.py
Diffstat (limited to 'scripts/rifle')
0 files changed, 0 insertions, 0 deletions