summary refs log tree commit diff stats
path: root/Makefile
diff options
context:
space:
mode:
authorhut <hut@lepus.uberspace.de>2015-10-04 02:12:41 +0200
committerhut <hut@lepus.uberspace.de>2015-10-04 02:13:49 +0200
commita4e19226af444e2b08432bc95b528cbd0cd463a5 (patch)
tree4d7aa558ddc141363c942979e2d5c698367bb463 /Makefile
parentf8ed0eebb97c6ba725f04df168964c49fa16a541 (diff)
parenta0b6b9e0b155631866fbb7681dac2cdb577db415 (diff)
downloadranger-a4e19226af444e2b08432bc95b528cbd0cd463a5.tar.gz
Merge branch 'stable'
Conflicts:
	CHANGELOG
	CHANGELOG.md
	doc/ranger.1
        ranger/__init__.py
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions