xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #2163 - fix Eclipse CDT metadata after merge

Browse source 
Former-commit-id: 277d72298e [formerly ea4cbc4c9a] [formerly 351824fb85] [formerly b88a13d3b5 [formerly 351824fb85 [formerly 7502d12a78c68f56e33a41bae7b3346d195ad79f]]]
Former-commit-id: b88a13d3b5
Former-commit-id: 36773401b7a2515d282f22c11fbcd2c522248e81 [formerly 4670dcb9a7]
Former-commit-id: 1918d5e96a
This commit is contained in:
Bryan Kowal 2013-09-04 14:49:47 -05:00
parent 2fbf708d37
commit f5b3756c16
2 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nativeLib/edex_com/.cproject
View file

@ -201,12 +201,9 @@
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="edex_com.cdt.managedbuild.target.gnu.so.206598592" name="Shared Library" projectType="cdt.managedbuild.target.gnu.so"/>
</storageModule>
<<<<<<< HEAD
<storageModule moduleId="refreshScope" versionNumber="1">
<resource resourceType="PROJECT" workspacePath="/edex_com"/>
</storageModule>
=======
>>>>>>> 7f3b822... Issue #2163 - RHEL6 nativeLib changes required for compiler compatibility
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
@ -954,8 +951,4 @@
</profile>
</scannerConfigBuildInfo>
</storageModule>
<<<<<<< HEAD
=======
<storageModule moduleId="refreshScope"/>
>>>>>>> 7f3b822... Issue #2163 - RHEL6 nativeLib changes required for compiler compatibility
</cproject>

7
nativeLib/edex_notify/.cproject
View file

@ -175,10 +175,7 @@
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="edex_notify.cdt.managedbuild.target.gnu.exe.1393028794" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/>
</storageModule>
<<<<<<< HEAD
<storageModule moduleId="refreshScope"/>
=======
>>>>>>> 7f3b822... Issue #2163 - RHEL6 nativeLib changes required for compiler compatibility
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
@ -428,8 +425,4 @@
</profile>
</scannerConfigBuildInfo>
</storageModule>
<<<<<<< HEAD
=======
<storageModule moduleId="refreshScope"/>
>>>>>>> 7f3b822... Issue #2163 - RHEL6 nativeLib changes required for compiler compatibility
</cproject>