summary refs log tree commit diff stats
path: root/Makefile
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2013-02-24 15:45:08 +0100
committerhut <hut@lavabit.com>2013-02-24 15:45:08 +0100
commit3d8af3624e773371e6af58745daba096e77e5166 (patch)
treeea354a9d14d7288ce29741c198fdc092f623c971 /Makefile
parentf29cf296420c257a55faaf485e3ef71f83ce6613 (diff)
parentbf6a3d6d6c11a85c37322e713b3c7a6eb2a484fc (diff)
downloadranger-3d8af3624e773371e6af58745daba096e77e5166.tar.gz
Merge branch 'vcs'
Conflicts:
	ranger/gui/widgets/__init__.py
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions