From 9f0ccdd2d191e970d4f206c60937cbe47910dfd5 Mon Sep 17 00:00:00 2001
From: Ron Anderson <ron.anderson@raytheon.com>
Date: Mon, 2 Jun 2014 13:40:26 -0500
Subject: [PATCH] Omaha #3132 Fix ohd merge issues.

Change-Id: I9cd7f10b55d4e599152827e4f5a793be11ce37fc

Former-commit-id: c294a06b722282140c6ab866998adc8aa6140c26 [formerly 8ef6180ac2aea5436efac1ea48c21504f6d3f0e6 [formerly 0c569e624949617e8f8ea3a5c7290767523eda2e] [formerly c294a06b722282140c6ab866998adc8aa6140c26 [formerly 5b3b83fe73b905c1d3e3743baf632e1364475eaf]]]
Former-commit-id: 8ef6180ac2aea5436efac1ea48c21504f6d3f0e6 [formerly 0c569e624949617e8f8ea3a5c7290767523eda2e]
Former-commit-id: 8ef6180ac2aea5436efac1ea48c21504f6d3f0e6
Former-commit-id: 4c8028f2527dbfc67692ab2180727d3f2bde07c3
---
 edexOsgi/build.edex/edex/common.properties    | 10 +++++-----
 ohd/com.raytheon.uf.edex.ohd.feature/.project | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 ohd/com.raytheon.uf.edex.ohd.feature/.project

diff --git a/edexOsgi/build.edex/edex/common.properties b/edexOsgi/build.edex/edex/common.properties
index b5d1ecbe0a..918922de66 100644
--- a/edexOsgi/build.edex/edex/common.properties
+++ b/edexOsgi/build.edex/edex/common.properties
@@ -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
diff --git a/ohd/com.raytheon.uf.edex.ohd.feature/.project b/ohd/com.raytheon.uf.edex.ohd.feature/.project
new file mode 100644
index 0000000000..1f13f4bb29
--- /dev/null
+++ b/ohd/com.raytheon.uf.edex.ohd.feature/.project
@@ -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>