From: Chang.H.S <jhs@dev3>
Date: Wed, 28 Sep 2011 08:52:27 +0000 (+0900)
Subject: Remote Control Code : fix merge Conflict
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=1a80430c750fbd7e5725a9cfa3c5dd093d20bc79

Remote Control Code : fix merge Conflict
---

1a80430c750fbd7e5725a9cfa3c5dd093d20bc79
diff --cc configure.ac
index de3fa09,ee8130b..f4068cb
--- a/configure.ac
+++ b/configure.ac
@@@ -211,8 -211,8 +211,10 @@@ lib/python/Plugins/SystemPlugins/Manual
  lib/python/Plugins/SystemPlugins/ManualFancontrol/meta/Makefile
  lib/python/Plugins/SystemPlugins/Blindscan/Makefile
  lib/python/Plugins/SystemPlugins/Blindscan/meta/Makefile
 +lib/python/Plugins/SystemPlugins/RemoteControlCode/Makefile
 +lib/python/Plugins/SystemPlugins/RemoteControlCode/meta/Makefile
+ lib/python/Plugins/SystemPlugins/WebBrowser/Makefile
+ lib/python/Plugins/SystemPlugins/WebBrowser/meta/Makefile
  lib/python/Tools/Makefile
  lib/service/Makefile
  lib/components/Makefile
diff --cc lib/python/Plugins/SystemPlugins/Makefile.am
index feadb2d,86802b0..0caab12
--- a/lib/python/Plugins/SystemPlugins/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/Makefile.am
@@@ -5,7 -5,7 +5,7 @@@ SUBDIRS = SoftwareManager Frontprocesso
  	DefaultServicesScanner NFIFlash DiseqcTester CommonInterfaceAssignment \
  	CrashlogAutoSubmit CleanupWizard VideoEnhancement WirelessLan NetworkWizard \
  	TempFanControl FactoryTest Fancontrol FPGAUpgrade WirelessLanSetup ManualFancontrol \
- 	Blindscan RemoteControlCode
 -	Blindscan WebBrowser
++	Blindscan WebBrowser RemoteControlCode 
  
  install_PYTHON =	\
  	__init__.py