Remote Control Code : fix merge Conflict
authorChang.H.S <jhs@dev3>
Wed, 28 Sep 2011 08:52:27 +0000 (17:52 +0900)
committerChang.H.S <jhs@dev3>
Wed, 28 Sep 2011 08:52:27 +0000 (17:52 +0900)
1  2 
configure.ac
lib/python/Plugins/SystemPlugins/Makefile.am

diff --cc 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
@@@ -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