Merge pull request #3489 from guyrichie/hci_epg

author Lars Op den Kamp <opdenkamp@gmail.com>

Sat, 9 Nov 2013 17:09:24 +0000 (09:09 -0800)

committer Lars Op den Kamp <opdenkamp@gmail.com>

Sat, 9 Nov 2013 17:09:24 +0000 (09:09 -0800)
author Lars Op den Kamp <opdenkamp@gmail.com>
Sat, 9 Nov 2013 17:09:24 +0000 (09:09 -0800)
committer Lars Op den Kamp <opdenkamp@gmail.com>
Sat, 9 Nov 2013 17:09:24 +0000 (09:09 -0800)
diff --cc xbmc/settings/AdvancedSettings.cpp
Simple merge
diff --cc xbmc/settings/AdvancedSettings.h
Simple merge
author	Lars Op den Kamp <opdenkamp@gmail.com>
	Sat, 9 Nov 2013 17:09:24 +0000 (09:09 -0800)
committer	Lars Op den Kamp <opdenkamp@gmail.com>
	Sat, 9 Nov 2013 17:09:24 +0000 (09:09 -0800)
		1	2
xbmc/settings/AdvancedSettings.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
xbmc/settings/AdvancedSettings.h	patch \|	diff1 \|	diff2 \|	blob \| history