Merge pull request #4646 from xhaggi/channel-selection

author Sascha Woo <sascha.woo@gmail.com>

Wed, 7 May 2014 08:03:37 +0000 (10:03 +0200)

committer Sascha Woo <sascha.woo@gmail.com>

Wed, 7 May 2014 08:03:37 +0000 (10:03 +0200)
author Sascha Woo <sascha.woo@gmail.com>
Wed, 7 May 2014 08:03:37 +0000 (10:03 +0200)
committer Sascha Woo <sascha.woo@gmail.com>
Wed, 7 May 2014 08:03:37 +0000 (10:03 +0200)
diff --cc language/English/strings.po
Simple merge
diff --cc xbmc/epg/GUIEPGGridContainer.cpp
Simple merge
author	Sascha Woo <sascha.woo@gmail.com>
	Wed, 7 May 2014 08:03:37 +0000 (10:03 +0200)
committer	Sascha Woo <sascha.woo@gmail.com>
	Wed, 7 May 2014 08:03:37 +0000 (10:03 +0200)
		1	2
language/English/strings.po	patch \|	diff1 \|	diff2 \|	blob \| history
xbmc/epg/GUIEPGGridContainer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history