# HG changeset patch
# User Edouard Tisserant
# Date 1339777737 -7200
# Node ID 73dcd03f53bb280879c24bb4a8106ba50d00676c
# Parent  299a4e34538026318b5e32216385f28f66ba9a8f# Parent  8863b78144ee8ed108ae1d5b3b2b311b3e8ee014
merge

diff -r 8863b78144ee -r 73dcd03f53bb LPCManager.py
--- a/LPCManager.py	Fri Jun 15 18:04:17 2012 +0200
+++ b/LPCManager.py	Fri Jun 15 18:28:57 2012 +0200
@@ -62,6 +62,15 @@
 sys.path.append(os.path.join(_base_folder, "beremiz"))
 
 _base_path = os.path.split(__file__)[0]
+import features
+from POULibrary import POULibrary
+
+class PLCLibrary(POULibrary):
+    def GetLibraryPath(self):
+        return os.path.join(_base_path, "pous.xml")
+
+features.libraries=[('LPC', lambda: PLCLibrary)]
+
 
 import connectors
 from LPCconnector import LPC_connector_factory
@@ -79,17 +88,6 @@
 misc.opjimg = lambda imgname: os.path.join(_base_folder, "beremiz", "images", imgname+".png")
 
 from Beremiz import *
-
-import features
-from POULibrary import POULibrary
-
-class PLCLibrary(POULibrary):
-    def GetLibraryPath(self):
-        return os.path.join(_base_path, "pous.xml")
-
-features.libraries.append(
-    ('LPC', lambda: PLCLibrary))
-
 from ProjectController import ProjectController
 from ConfigTreeNode import ConfigTreeNode
 from ProjectNodeEditor import ProjectNodeEditor