Conflicts:
configure.ac
lib/python/Plugins/SystemPlugins/Makefile.am
lib/python/Plugins/SystemPlugins/FactoryTest/Makefile
lib/python/Plugins/SystemPlugins/Fancontrol/Makefile
lib/python/Plugins/SystemPlugins/Fancontrol/meta/Makefile
+lib/python/Plugins/SystemPlugins/FPGAUpgrade/Makefile
+lib/python/Plugins/SystemPlugins/FPGAUpgrade/meta/Makefile
+ lib/python/Plugins/SystemPlugins/WirelessLanSetup/Makefile
+ lib/python/Plugins/SystemPlugins/WirelessLanSetup/meta/Makefile
lib/python/Tools/Makefile
lib/service/Makefile
lib/components/Makefile
SkinSelector SatelliteEquipmentControl Videomode VideoTune Hotplug \
DefaultServicesScanner NFIFlash DiseqcTester CommonInterfaceAssignment \
CrashlogAutoSubmit CleanupWizard VideoEnhancement WirelessLan NetworkWizard \
- TempFanControl FactoryTest Fancontrol FPGAUpgrade
- TempFanControl FactoryTest Fancontrol WirelessLanSetup
++ TempFanControl FactoryTest Fancontrol FPGAUpgrade WirelessLanSetup
install_PYTHON = \
__init__.py