Merge pull request #4927 from mkortstiege/masterprompt
authorjmarshallnz <jcmarsha@gmail.com>
Thu, 26 Jun 2014 20:05:52 +0000 (08:05 +1200)
committerTrent Nelson <trent.nelson@pivosgroup.com>
Tue, 8 Jul 2014 07:26:52 +0000 (15:26 +0800)
commit3dd5e80e3796b8c2e37171c085a5ace59abd24e8
treeb92ef27993b18703425d67c9ae803bb97bff2c8e
parentc39c6edd129af3b57c1dc9e9ba2a9ba76e02cba8
Merge pull request #4927 from mkortstiege/masterprompt

prompt for master pin in case the addon manager is locked
xbmc/addons/AddonInstaller.cpp
xbmc/addons/GUIDialogAddonInfo.cpp
xbmc/addons/GUIDialogAddonSettings.cpp