Merge remote-tracking branch 'fernetmenta/addongui' into pvrapi_1_7_0. Github issue...
authorLars Op den Kamp <lars@opdenkamp.eu>
Wed, 6 Mar 2013 23:39:27 +0000 (00:39 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Wed, 6 Mar 2013 23:39:44 +0000 (00:39 +0100)
1  2 
xbmc/addons/AddonCallbacks.h
xbmc/addons/include/xbmc_pvr_types.h
xbmc/pvr/addons/PVRClient.cpp
xbmc/pvr/addons/PVRClient.h

Simple merge
Simple merge
Simple merge
Simple merge