# HG changeset patch
# User laurent
# Date 1260444702 -3600
# Node ID d7bf56b036a8c1dc1c052df78e2605277851822c
# Parent  af7c28de4cc776751c05e02bb450128d9c84175f# Parent  c78246f3b85b4bb7a4fcb939f8ab05205e52d00c
Changes merged

diff -r af7c28de4cc7 -r d7bf56b036a8 LPCBeremiz.py
--- a/LPCBeremiz.py	Thu Dec 10 12:30:49 2009 +0100
+++ b/LPCBeremiz.py	Thu Dec 10 12:31:42 2009 +0100
@@ -347,7 +347,8 @@
             srcpath = os.path.join(src,i)
             dstpath = os.path.join(dst,i)
             if os.path.isdir(srcpath):
-                os.makedirs(dstpath)
+                if not os.path.exists(dstpath):
+                    os.makedirs(dstpath)
                 mycopytree(srcpath, dstpath)
             elif os.path.isfile(srcpath):
                 shutil.copy2(srcpath, dstpath)
diff -r af7c28de4cc7 -r d7bf56b036a8 targets/LPC/plc_LPC_main.c
--- a/targets/LPC/plc_LPC_main.c	Thu Dec 10 12:30:49 2009 +0100
+++ b/targets/LPC/plc_LPC_main.c	Thu Dec 10 12:31:42 2009 +0100
@@ -94,7 +94,7 @@
 }
 
 void Retain(unsigned int offset, unsigned int count, void *p)
-{t
+{
 }
 
 void Remind(unsigned int offset, unsigned int count, void *p)