Commit graph

6 commits

Author SHA1 Message Date
Steve Harris
f7e218e8f9 Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
Conflicts:
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java

deleted 'H5U; PlotResource2.java was not edited


Former-commit-id: 7a10ca9766 [formerly 92084b3f20 [formerly d0bbbfefcc] [formerly 7a10ca9766 [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]
Former-commit-id: 92084b3f20 [formerly d0bbbfefcc]
Former-commit-id: 92084b3f20
Former-commit-id: 5a96582f16
2012-02-23 10:06:18 -06:00
Roger Ferrel
0117e5a38b Issue #181
Changes from January ncep_cave

Former-commit-id: fa42f2dc60 [formerly ae0981ac0f [formerly 7427aeaf29] [formerly fa42f2dc60 [formerly 6a878c3c5f400c53d39d7920c0619362aaafb946]]]
Former-commit-id: ae0981ac0f [formerly 7427aeaf29]
Former-commit-id: ae0981ac0f
Former-commit-id: aa10b2f656
2012-01-26 09:26:07 -06:00
Bryan Kowal
ea61776821 Issue #24 - merging jep changes into git thinclient branch.
Former-commit-id: cf4d56d0a0 [formerly be0b6a87eb [formerly 5039d66b12] [formerly cf4d56d0a0 [formerly 89f42f2933110db2f8ae8ffb299a4de5fa3b87ac]]]
Former-commit-id: be0b6a87eb [formerly 5039d66b12]
Former-commit-id: be0b6a87eb
Former-commit-id: c1d930b119
2012-01-23 13:25:11 -06:00
Bryan Kowal
3057cd2656 Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
Former-commit-id: 2b5ee4b940 [formerly 971bf802ac [formerly 2142afe3f1] [formerly 2b5ee4b940 [formerly 296d2915b17f0086d93e200d4780663bff34edbb]]]
Former-commit-id: 971bf802ac [formerly 2142afe3f1]
Former-commit-id: 971bf802ac
Former-commit-id: 28957b7118
2012-01-20 11:37:38 -06:00
Matt Nash
6bcbc7d8ef Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: 580e2938d7 [formerly 66be3bec40]
Former-commit-id: 580e2938d7
Former-commit-id: d8da2252c3
2012-01-19 11:53:12 -06:00
root
2b462d8665 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: a02aeb236c [formerly 9f19e3f712]
Former-commit-id: a02aeb236c
Former-commit-id: 133dc97f67
2012-01-06 08:55:05 -06:00