Steve Harris 2dbdc945bf Merge branch 'ss_sync' into 9-Wes2Bridge ... Conflicts: .gitignore ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/src/gov/noaa/nws/ncep/common/dataplugin/h5scd/H5ScdRecord.java ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/src/gov/noaa/nws/ncep/common/dataplugin/h5uair/H5UairRecord.java ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java deleted h5 files using ss_sync version of java files Former-commit-id: 6d01784115 [formerly 24059a5b4e] [formerly 9b67525e95] [formerly e5b56c99ab [formerly 9b67525e95 [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]] Former-commit-id: e5b56c99ab Former-commit-id: 6a444fc4fae979713c005a8d9737369a6bcbce84 [formerly 40d7357165] Former-commit-id: 73a337bc31		2012-02-27 15:58:49 -06:00
..
cache	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
db/hibernateConfig	Moving 12.1.1 into ss_sync	2012-01-19 11:53:12 -06:00
res	Issue #20: Merge all changes from previous SVN repo to GIT.	2012-01-26 17:38:43 -06:00
spring	Issue #20: Committing refactored archiver capability	2012-02-13 16:09:36 -06:00
banner.txt	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
log4j-ingest.xml	Issue #20: Merge all changes from previous SVN repo to GIT.	2012-01-26 17:38:43 -06:00
log4j.xml	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
modes.xml	Issue #181 disable nctext-ingest	2012-01-31 09:45:27 -06:00