Merge pull request #704 from Quentangle/default_season_attribute

author jmarshallnz <jcmarsha@gmail.com>

Fri, 30 Mar 2012 03:38:17 +0000 (20:38 -0700)

committer jmarshallnz <jcmarsha@gmail.com>

Fri, 30 Mar 2012 03:38:17 +0000 (20:38 -0700)
author jmarshallnz <jcmarsha@gmail.com>
Fri, 30 Mar 2012 03:38:17 +0000 (20:38 -0700)
committer jmarshallnz <jcmarsha@gmail.com>
Fri, 30 Mar 2012 03:38:17 +0000 (20:38 -0700)
diff --cc xbmc/settings/AdvancedSettings.cpp
Simple merge
diff --cc xbmc/settings/AdvancedSettings.h
Simple merge
diff --cc xbmc/video/VideoInfoScanner.cpp
Simple merge
author	jmarshallnz <jcmarsha@gmail.com>
	Fri, 30 Mar 2012 03:38:17 +0000 (20:38 -0700)
committer	jmarshallnz <jcmarsha@gmail.com>
	Fri, 30 Mar 2012 03:38:17 +0000 (20:38 -0700)
		1	2
xbmc/settings/AdvancedSettings.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
xbmc/settings/AdvancedSettings.h	patch \|	diff1 \|	diff2 \|	blob \| history
xbmc/video/VideoInfoScanner.cpp	patch \|	diff1 \|	diff2 \|	blob \| history