Mercurial > hg > beaglert
comparison .cproject @ 11:517715b23df0
merge
author | andrewm |
---|---|
date | Thu, 13 Nov 2014 16:02:59 +0100 |
parents | 49f22e1246b2 08246efd51da |
children | a6beeba3a648 |
comparison
equal
deleted
inserted
replaced
10:49f22e1246b2 | 11:517715b23df0 |
---|---|
80 </toolChain> | 80 </toolChain> |
81 </folderInfo> | 81 </folderInfo> |
82 <sourceEntries> | 82 <sourceEntries> |
83 <entry excluding="audio_routines_old.S" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="core"/> | 83 <entry excluding="audio_routines_old.S" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="core"/> |
84 <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include"/> | 84 <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include"/> |
85 <entry excluding="basic_analog_output|basic_sensor|d-box|audio_in_FFT|filter_IIR|filter_FIR|samples|oscillator_bank|basic" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="projects"/> | 85 <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="projects/tank_wars"/> |
86 </sourceEntries> | 86 </sourceEntries> |
87 </configuration> | 87 </configuration> |
88 </storageModule> | 88 </storageModule> |
89 <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> | 89 <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> |
90 </cconfiguration> | 90 </cconfiguration> |
154 </toolChain> | 154 </toolChain> |
155 </folderInfo> | 155 </folderInfo> |
156 <sourceEntries> | 156 <sourceEntries> |
157 <entry excluding="audio_routines_old.S" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="core"/> | 157 <entry excluding="audio_routines_old.S" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="core"/> |
158 <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include"/> | 158 <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include"/> |
159 <entry excluding="basic_analog_output|basic_sensor|d-box|audio_in_FFT|filter_IIR|filter_FIR|samples|oscillator_bank|basic" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="projects"/> | 159 <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="projects/tank_wars"/> |
160 </sourceEntries> | 160 </sourceEntries> |
161 </configuration> | 161 </configuration> |
162 </storageModule> | 162 </storageModule> |
163 <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> | 163 <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> |
164 </cconfiguration> | 164 </cconfiguration> |