From: Chang.H.S <jhs@dev3>
Date: Fri, 20 May 2011 04:05:35 +0000 (+0900)
Subject: Merge branch 'WirelessLanSetup' into vuplus_experimental
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=36cca1d3f31265929ef3443999ab7fd242b4dae5

Merge branch 'WirelessLanSetup' into vuplus_experimental

Conflicts:
	configure.ac
	lib/python/Plugins/SystemPlugins/Makefile.am
---

36cca1d3f31265929ef3443999ab7fd242b4dae5
diff --cc configure.ac
index 38b66d3,a0861ad..ccb1e00
--- a/configure.ac
+++ b/configure.ac
@@@ -203,8 -197,8 +203,10 @@@ lib/python/Plugins/SystemPlugins/Wirele
  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
diff --cc lib/python/Plugins/SystemPlugins/Makefile.am
index a2aa9e2,4dff0af..3594da2
--- a/lib/python/Plugins/SystemPlugins/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/Makefile.am
@@@ -4,7 -4,7 +4,7 @@@ SUBDIRS = SoftwareManager Frontprocesso
  	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