3 commits

Author	SHA1	Message	Date
Dustin Johnson	19c2e301b8	Issue #1302 Restore jdom.jar, delete net.jcip/.project ... Amend: Also change the manifest and .classpath for ohd common Change-Id: I26b4e88d36da6c38da393f2428b79735c881a23b Former-commit-id: 2b6e98954e [formerly 595c421e47 [formerly 49b999039c470a5df095a202b5a67bf036a5b71c]] Former-commit-id: 595c421e47 Former-commit-id: db4d728eb7	2012-11-08 14:47:17 -06:00
Dustin Johnson	7d0e4a6e75	Issue #1302 Merge branch '5-Data_Delivery' into development ... Conflicts: edexOsgi/build.edex/deploy-common/external-rules.xml edexOsgi/build.edex/deploy-common/plugin-methods.xml edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java edexOsgi/build.edex/build.xml edexOsgi/build.edex/esb/conf/modes.xml edexOsgi/com.raytheon.edex.feature.uframe/feature.xml edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0 Former-commit-id: 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]] Former-commit-id: 98d7beae50 Former-commit-id: 8e69107b5a	2012-11-01 13:36:06 -05:00
root	133dc97f67	Initial revision of AWIPS2 11.9.0-7p5 ... Former-commit-id: 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]] Former-commit-id: 9f19e3f712 Former-commit-id: a02aeb236c	2012-01-06 08:55:05 -06:00