Omaha #3132 Fix ohd merge issues.

Change-Id: I9cd7f10b55d4e599152827e4f5a793be11ce37fc

Former-commit-id: c294a06b72 [formerly 8ef6180ac2 [formerly 0c569e6249] [formerly c294a06b72 [formerly 5b3b83fe73b905c1d3e3743baf632e1364475eaf]]]
Former-commit-id: 8ef6180ac2 [formerly 0c569e6249]
Former-commit-id: 8ef6180ac2
Former-commit-id: 4c8028f252
This commit is contained in:
Ron Anderson 2014-06-02 13:40:26 -05:00
parent 3c39c7688c
commit 9f0ccdd2d1
2 changed files with 22 additions and 5 deletions

View file

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

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>