Merge pull request #4966 from tamland/tvregex

Relax tv show matching for names without season

diff --cc Makefile.in
index c4129f5,504b91d..a21013f
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -292,16 -292,16 +292,18 @@@ GTEST_LIBS = $(GTEST_DIR)/lib/.libs/lib
  CHECK_DIRS = xbmc/addons/test \
               xbmc/filesystem/test \
               xbmc/utils/test \
+              xbmc/video/test \
               xbmc/threads/test \
               xbmc/interfaces/python/test \
 +             xbmc/cores/AudioEngine/Sinks/test \
               xbmc/test
  CHECK_LIBS = xbmc/addons/test/addonsTest.a \
               xbmc/filesystem/test/filesystemTest.a \
               xbmc/utils/test/utilsTest.a \
+              xbmc/video/test/videoTest.a \
               xbmc/threads/test/threadTest.a \
               xbmc/interfaces/python/test/pythonSwigTest.a \
 +             xbmc/cores/AudioEngine/Sinks/test/AESinkTest.a \
               xbmc/test/xbmc-test.a
  
  ifeq (@USE_WAYLAND@,1)

diff --cc xbmc/settings/AdvancedSettings.cpp
Simple merge