From 056b3bed4f86b394a24c27cc048f847a72ec9c02 Mon Sep 17 00:00:00 2001
From: Coing <hilllina@163.com>
Date: Wed, 17 Dec 2014 20:34:19 +0800
Subject: [PATCH] create project.uvprojx by scons mdk5 and delete some useless
 files

---
 bsp/lpc5410x/project.uvoptx  | 2 +-
 bsp/lpc5410x/project.uvprojx | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/bsp/lpc5410x/project.uvoptx b/bsp/lpc5410x/project.uvoptx
index b489444e69..bf8da45188 100644
--- a/bsp/lpc5410x/project.uvoptx
+++ b/bsp/lpc5410x/project.uvoptx
@@ -167,7 +167,7 @@
 
   <Group>
     <GroupName>Applications</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
diff --git a/bsp/lpc5410x/project.uvprojx b/bsp/lpc5410x/project.uvprojx
index 6a1efb31c9..a33a383a9b 100644
--- a/bsp/lpc5410x/project.uvprojx
+++ b/bsp/lpc5410x/project.uvprojx
@@ -365,7 +365,11 @@
               <MiscControls></MiscControls>
               <Define>CORE_M4</Define>
               <Undefine></Undefine>
+<<<<<<< HEAD
               <IncludePath>.;..\..\components\drivers\include;..\..\components\finsh;..\..\include;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m4;Libraries\CMSIS\Include;Libraries\lpc_chip\chip_5410x;Libraries\lpc_chip\chip_5410x\config;Libraries\lpc_chip\chip_common;applications;drivers</IncludePath>
+=======
+              <IncludePath>applications;.;drivers;Libraries\CMSIS\Include;Libraries\lpc_chip\chip_common;Libraries\lpc_chip\chip_5410x;Libraries\lpc_chip\chip_5410x\config;..\..\include;..\..\libcpu\arm\cortex-m4;..\..\libcpu\arm\common;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\finsh</IncludePath>
+>>>>>>> f68b03f089805f585e6f634b0db80e377344c21d
             </VariousControls>
           </Cads>
           <Aads>