Merge branch 'master' into dev

This commit is contained in:
clinton-hall 2013-03-21 18:42:43 +10:30
commit c68e1bc41c
2 changed files with 11 additions and 0 deletions

View file

@ -24,6 +24,14 @@ To enable Torrent extraction, on Windows, you need to install [7-zip](http://www
"unrar", "unzip", "tar", "7zr" "unrar", "unzip", "tar", "7zr"
note: "7zr" is available from the p7zip package. Available on optware. note: "7zr" is available from the p7zip package. Available on optware.
Contribution
------------
We who have developed nzbToMedia believe in the openess of open-source, and as such we hope that any modifications will lead back to the [orignal repo](https://github.com/clinton-hall/nzbToMedia "orignal repo") via pull requests.
Founder: [clinton-hall](https://github.com/clinton-hall "clinton-hall")
Contributors: Can be viewed [here](https://github.com/clinton-hall/nzbToMedia/contributors "here")
In order to use the transcoding option you will need to install ffmpeg. In order to use the transcoding option you will need to install ffmpeg.
Installation instructions for this are available in the [wiki](https://github.com/clinton-hall/nzbToMedia/wiki/Transcoder "wiki") Installation instructions for this are available in the [wiki](https://github.com/clinton-hall/nzbToMedia/wiki/Transcoder "wiki")

View file

@ -1,3 +1,6 @@
# nzbToMedia Configuration
# For more information, visit https://github.com/clinton-hall/nzbToMedia/wiki
[CouchPotato] [CouchPotato]
#### autoProcessing for Movies #### autoProcessing for Movies
#### cpsCategory - category that gets called for post-processing with CPS #### cpsCategory - category that gets called for post-processing with CPS