Merge branch 'clinton-hall/dev'

Conflicts:
	autoProcess/autoProcessMovie.py
	autoProcess/autoProcessMusic.py
	autoProcess/autoProcessTV.py
	autoProcess/migratecfg.py
	autoProcess/nzbToMediaUtil.py
This commit is contained in:
echel0n 2014-04-01 21:48:57 -07:00
commit 6cffd5364d
13 changed files with 96 additions and 44 deletions

View file

@ -43,6 +43,11 @@
# set as required to ensure correct processing.
#hpdelay=65
# HeadPhones process Time Per GiB
#
# Set the number of seconds to wait, for each GiB of data, before timing out. If transfering files across drives or network, increase this value as needed.
#hpTimePerGiB=60
## WakeOnLan
# use WOL (0, 1).