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

Merge "Omaha #3132 Fix ohd merge issues." into omaha_14.4.1

Browse source 
Former-commit-id: e5ffd0f40c [formerly e5ffd0f40c [formerly b57f019ff57da1193823bcba75698077f7c7e6b4]]
Former-commit-id: 75ee567f85
Former-commit-id: 447e46f682
This commit is contained in:
cmadmin 2014-06-02 13:59:15 -05:00 • committed by Gerrit Code Review
commit fc269f33dd
2 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
edexOsgi/build.edex/edex/common.properties
View file

@ -16,12 +16,12 @@ dir.06=edu
dir.07=ost dir.07=ost
dir.08=ohd dir.08=ohd
# directories from ufcore # directories from ufcore
dir.08=common dir.09=common
dir.09=edex dir.10=edex
dir.10=features dir.11=features
dir.11=viz dir.12=viz
# directories from ufcore-foss # directories from ufcore-foss
dir.12=lib dir.13=lib
# the directory that contains the localization projects # the directory that contains the localization projects

17
ohd/com.raytheon.uf.edex.ohd.feature/.project Normal file
View file

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>com.raytheon.uf.edex.ohd.feature</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>