Mirrors_Framework/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-09-28 16:14:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #408 from Coing/rt-threadCoing

Browse Source 
fix project.uvoptx can't open,recreate the project.uvoptx. this commit i...
This commit is contained in:
Bernard Xiong
2015-01-06 22:09:10 +08:00
parent c3515abf93 70aaf4237f
commit da139a4a2f
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bsp/lpc5410x/project.uvoptx
+2 -2
View File
@@ -167,7 +167,7 @@
<Group> <Group>
<GroupName>Applications</GroupName> <GroupName>Applications</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
@@ -227,7 +227,7 @@
<Group> <Group>
<GroupName>Drivers</GroupName> <GroupName>Drivers</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
bsp/lpc5410x/project.uvprojx
-4
View File
@@ -365,11 +365,7 @@
<MiscControls></MiscControls> <MiscControls></MiscControls>
<Define>CORE_M4</Define> <Define>CORE_M4</Define>
<Undefine></Undefine> <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>.;..\..\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> </VariousControls>
</Cads> </Cads>
<Aads> <Aads>