From: ghost <andreas.monzner@multimedia-labs.de>
Date: Tue, 5 Jan 2010 18:01:59 +0000 (+0100)
Subject: Merge remote branch 'remotes/origin/fantempplugin'
X-Git-Tag: 2.8.0~82
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/c352487661e7927d0068ef8fa69765055ff488d8?hp=-c

Merge remote branch 'remotes/origin/fantempplugin'
---

c352487661e7927d0068ef8fa69765055ff488d8
diff --combined configure.ac
index 1bda10ea,18801002..aa2fa3e3
--- a/configure.ac
+++ b/configure.ac
@@@ -155,6 -155,7 +155,7 @@@ lib/python/Plugins/SystemPlugins/Frontp
  lib/python/Plugins/SystemPlugins/Hotplug/Makefile
  lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile
  lib/python/Plugins/SystemPlugins/Makefile
+ lib/python/Plugins/SystemPlugins/TempFanControl/Makefile
  lib/python/Plugins/SystemPlugins/NetworkWizard/Makefile
  lib/python/Plugins/SystemPlugins/NetworkWizard/meta/Makefile
  lib/python/Plugins/SystemPlugins/NFIFlash/Makefile
@@@ -176,7 -177,6 +177,7 @@@ lib/python/Plugins/SystemPlugins/VideoT
  lib/python/Plugins/SystemPlugins/Videomode/Makefile
  lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile
  lib/python/Plugins/SystemPlugins/WirelessLan/Makefile
 +lib/python/Plugins/SystemPlugins/WirelessLan/meta/Makefile
  lib/python/Tools/Makefile
  lib/service/Makefile
  lib/components/Makefile