summary refs log tree commit diff stats
path: root/HACKING
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-04-14 02:02:30 +0200
committerhut <hut@lavabit.com>2010-04-14 02:02:30 +0200
commiteba109b0ed0bf5fd6a39153d67c6150e56d988fb (patch)
treed1adf11b9ebf3be7ac68107600fc9d93af2275a6 /HACKING
parent19c1fa4f622ffd1597943f0005ba58a30b170bb4 (diff)
parentab5d63be742a6d6ca10443c12d561b0a1c861474 (diff)
downloadranger-eba109b0ed0bf5fd6a39153d67c6150e56d988fb.tar.gz
Merge branch 'master' into devel
Conflicts:
	ranger/core/actions.py
Diffstat (limited to 'HACKING')
0 files changed, 0 insertions, 0 deletions