Commit graph

15 commits

Author SHA1 Message Date
Bryan Kowal
8d444b35d3 Issue #1141 - Merging KML into the Common Baseline
Former-commit-id: 7b45633097 [formerly c3f584fdc5f53ecd62afe41c481aaa96cf532009]
Former-commit-id: 3180ae0c57
2012-09-05 18:39:08 -05:00
Steve Harris
bdb45cdfae 12.9.1-10 baseline
Former-commit-id: cb9b80f3a0 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]
Former-commit-id: 3adc50a783
2012-08-30 14:28:27 -05:00
Steve Harris
a1d931fd44 12.9.1-5 baseline
Former-commit-id: f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]
Former-commit-id: 61f269f54c
2012-08-21 15:27:03 -05:00
Steve Harris
7c064b6868 12.6.1-9 baseline
Former-commit-id: 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]
Former-commit-id: 2c0ff851ca
2012-07-10 07:53:49 -05:00
Steve Harris
8552902906 12.5.1-15 baseline
Former-commit-id: 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]
Former-commit-id: b13cbb7e00
2012-06-08 13:39:48 -05:00
Steve Harris
4bfbdad17d 12.4.1-10 baseline
Former-commit-id: 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]
Former-commit-id: 9f8cb727a5
2012-05-01 18:06:13 -05:00
Steve Harris
750b7543dd 12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 67a5a68300
2012-04-18 15:18:16 -05:00
Steve Harris
608a0c17a0 Merge branch 'ss_sync' into 4-Thin_Client
Former-commit-id: 46e1499e43 [formerly 2059372e90437312cf12f06de6c84d0824fb586c]
Former-commit-id: f9baa1c98c
2012-02-23 13:16:35 -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
Steve Harris
92084b3f20 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 5528a1374781f3a4d55702ae1f0c34efcf1e3865]
Former-commit-id: d0bbbfefcc
2012-02-23 10:06:18 -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
be0b6a87eb Issue #24 - merging jep changes into git thinclient branch.
Former-commit-id: cf4d56d0a0 [formerly 89f42f2933110db2f8ae8ffb299a4de5fa3b87ac]
Former-commit-id: 5039d66b12
2012-01-23 13:25:11 -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