Merge pull request #7323 from mapfau/xbmc_cosmetic

author Pär Björklund <per.bjorklund@gmail.com>

Sat, 11 Jul 2015 19:36:21 +0000 (21:36 +0200)

committer Pär Björklund <per.bjorklund@gmail.com>

Sat, 11 Jul 2015 19:36:21 +0000 (21:36 +0200)
author Pär Björklund <per.bjorklund@gmail.com>
Sat, 11 Jul 2015 19:36:21 +0000 (21:36 +0200)
committer Pär Björklund <per.bjorklund@gmail.com>
Sat, 11 Jul 2015 19:36:21 +0000 (21:36 +0200)
diff --cc xbmc/epg/EpgInfoTag.cpp
Simple merge
diff --cc xbmc/guilib/GUIFontTTF.cpp
Simple merge
diff --cc xbmc/pvr/channels/PVRChannelGroups.cpp
Simple merge
author	Pär Björklund <per.bjorklund@gmail.com>
	Sat, 11 Jul 2015 19:36:21 +0000 (21:36 +0200)
committer	Pär Björklund <per.bjorklund@gmail.com>
	Sat, 11 Jul 2015 19:36:21 +0000 (21:36 +0200)
		1	2
xbmc/epg/EpgInfoTag.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
xbmc/guilib/GUIFontTTF.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
xbmc/pvr/channels/PVRChannelGroups.cpp	patch \|	diff1 \|	diff2 \|	blob \| history