Merge pull request #1536 from Karlson2k/Imon_addition_01
authordavilla <davilla@xbmc.org>
Thu, 13 Dec 2012 18:25:18 +0000 (10:25 -0800)
committerdavilla <davilla@xbmc.org>
Thu, 13 Dec 2012 18:25:18 +0000 (10:25 -0800)
commit6671312465caf64feb5240ddd0ec2ccd9bdc780d
tree33b68dbb575e5c1d344ca380a3ee7ef658bbbd49
parent0630b59f54ced701881e1a322ce74bd41fb5f70f
parent4c21c6c36ef8da194c113b6414bed58e35e10a55
Merge pull request #1536 from Karlson2k/Imon_addition_01

Replace system-wide iMON setting with per-device setting
language/English/strings.po
xbmc/settings/GUISettings.cpp
xbmc/settings/GUIWindowSettingsCategory.cpp