Commit graph

12 commits

Author SHA1 Message Date
Steve Harris
a945ed8e6d 12.6.1-5 baseline
Former-commit-id: c99afab05f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]
Former-commit-id: 8947efbc7f
2012-06-11 16:23:47 -05:00
Steve Harris
c452cce633 12.5.1-6 baseline
Former-commit-id: 24474489f9 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]
Former-commit-id: fa87dc6cf1
2012-05-16 16:41:22 -05:00
Steve Harris
a821111fbf 12.5.1-2 baseline
Former-commit-id: 84d191e7b6 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]
Former-commit-id: b36c69cc67
2012-05-03 19:17:13 -05:00
Steve Harris
a4e519f3cd 12.4.1-4 baseline
Former-commit-id: 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 2a216f333c
2012-04-18 15:18:16 -05:00
Steve Harris
096ba6eb30 Merge branch 'ss_sync' into 4-Thin_Client
Former-commit-id: f9baa1c98c [formerly 2059372e90437312cf12f06de6c84d0824fb586c]
Former-commit-id: 46e1499e43
2012-02-23 13:16:35 -06:00
Steve Harris
a9b900821a removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
Former-commit-id: c502603907 [formerly cccea1aa13ad987a8c1f2b06c2dfcaa77967544d]
Former-commit-id: ecb38ba165
2012-02-23 12:45:50 -06:00
Steve Harris
3d511fe719 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: d0bbbfefcc [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]
Former-commit-id: 7a10ca9766
2012-02-23 10:06:18 -06:00
Roger Ferrel
376f6868b6 Issue #181
Changes from January ncep_cave

Former-commit-id: 7427aeaf29 [formerly 6a878c3c5f400c53d39d7920c0619362aaafb946]
Former-commit-id: fa42f2dc60
2012-01-26 09:26:07 -06:00
Bryan Kowal
90c33ef882 Issue #24 - merging jep changes into git thinclient branch.
Former-commit-id: 5039d66b12 [formerly 89f42f2933110db2f8ae8ffb299a4de5fa3b87ac]
Former-commit-id: cf4d56d0a0
2012-01-23 13:25:11 -06:00
Bryan Kowal
2a7b92ec91 Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
Former-commit-id: 2142afe3f1 [formerly 296d2915b17f0086d93e200d4780663bff34edbb]
Former-commit-id: 2b5ee4b940
2012-01-20 11:37:38 -06:00
Matt Nash
1faae42484 Moving 12.1.1 into ss_sync
Former-commit-id: 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: c83e5ff474
2012-01-19 11:53:12 -06:00
root
3360eb6c5f Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 06a8b51d6d
2012-01-06 08:55:05 -06:00