From: thedoc <thedoc@atom.(none)>
Date: Fri, 11 Dec 2009 12:01:26 +0000 (+0100)
Subject: Merge branch 'fantempplugin' into experimental
X-Git-Tag: 3.0.0~28^2~66^2~153
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/28dcf6be0ee22fedd728fef11ccff484f8a851e8?hp=-c

Merge branch 'fantempplugin' into experimental
---

28dcf6be0ee22fedd728fef11ccff484f8a851e8
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