awips2/cots/org.hibernate
Dustin Johnson 931d94d1de 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: 8e69107b5a [formerly 98d7beae50] [formerly 8e69107b5a [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]
Former-commit-id: 31d7d09c10
Former-commit-id: e7a0f96a9a [formerly bcf575966b]
Former-commit-id: 4d9c945388
2012-11-01 13:36:06 -05:00
..
.settings Issue #1302 Merge branch '5-Data_Delivery' into development 2012-11-01 13:36:06 -05:00
META-INF Issue #1302 Merge branch '5-Data_Delivery' into development 2012-11-01 13:36:06 -05:00
.classpath Issue #1302 Merge branch '5-Data_Delivery' into development 2012-11-01 13:36:06 -05:00
.project Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
build.properties Issue #1302 Merge branch '5-Data_Delivery' into development 2012-11-01 13:36:06 -05:00
hibernate-spatial-1.0.jar Issue #1302 Merge branch '5-Data_Delivery' into development 2012-11-01 13:36:06 -05:00
hibernate-spatial-postgis-1.0.jar Issue #1302 Merge branch '5-Data_Delivery' into development 2012-11-01 13:36:06 -05:00
hibernate3.5.0-Final.jar Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
javassist-3.9.0.GA.jar Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
jta-1.1.jar Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
org.hibernate.ecl 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00