Ruud 33602f227d Hope this fixes the crappy merge... ...

Conflicts:

	couchpotato/core/_base/_core/main.py
	couchpotato/core/_base/desktop/main.py

2012-01-14 12:12:54 +01:00

..

__init__.py

Libraries for Subliminal

2011-12-23 16:02:48 +01:00

autodetect.py

Libraries for Subliminal

2011-12-23 16:02:48 +01:00

date.py

Libraries for Subliminal

2011-12-23 16:02:48 +01:00

fileutils.py

Hope this fixes the crappy merge...

2012-01-14 12:12:54 +01:00

guess.py

Libraries for Subliminal

2011-12-23 16:02:48 +01:00

hash_ed2k.py

Libraries for Subliminal

2011-12-23 16:02:48 +01:00

hash_mpc.py

Libraries for Subliminal

2011-12-23 16:02:48 +01:00

ISO-639-2_utf-8.txt

Libraries for Subliminal

2011-12-23 16:02:48 +01:00

language.py

Libraries for Subliminal

2011-12-23 16:02:48 +01:00

matcher.py

Libraries for Subliminal

2011-12-23 16:02:48 +01:00

matchtree.py

Libraries for Subliminal

2011-12-23 16:02:48 +01:00

patterns.py

Libraries for Subliminal

2011-12-23 16:02:48 +01:00

slogging.py

Libraries for Subliminal

2011-12-23 16:02:48 +01:00

textutils.py

Libraries for Subliminal

2011-12-23 16:02:48 +01:00