Commit graph

7 commits

Author SHA1 Message Date
Steve Harris
24059a5b4e 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: e5b56c99ab [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]
Former-commit-id: 9b67525e95
2012-02-27 15:58:49 -06:00
Steve Harris
07ac42866c removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
Former-commit-id: ecb38ba165 [formerly cccea1aa13ad987a8c1f2b06c2dfcaa77967544d]
Former-commit-id: c502603907
2012-02-23 12:45:50 -06:00
David Gillingham
b31f40ec9d Issue #20: Merge all changes from previous SVN repo to GIT.
Former-commit-id: b056e18757 [formerly 926a2a6a5af5b3514c29097deb0fc24b093643a2]
Former-commit-id: 845e6c19af
2012-01-26 17:38:43 -06:00
Roger Ferrel
ae0981ac0f Issue #181
Changes from January ncep_cave

Former-commit-id: fa42f2dc60 [formerly 6a878c3c5f400c53d39d7920c0619362aaafb946]
Former-commit-id: 7427aeaf29
2012-01-26 09:26:07 -06:00
Bryan Kowal
971bf802ac Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
Former-commit-id: 2b5ee4b940 [formerly 296d2915b17f0086d93e200d4780663bff34edbb]
Former-commit-id: 2142afe3f1
2012-01-20 11:37:38 -06:00
Matt Nash
580e2938d7 Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: 66be3bec40
2012-01-19 11:53:12 -06:00
root
a02aeb236c Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 9f19e3f712
2012-01-06 08:55:05 -06:00