Steve Harris
|
2d02f819be
|
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: 5a96582f16 [formerly 92084b3f20] [formerly d0bbbfefcc] [formerly 7a10ca9766 [formerly d0bbbfefcc [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 6fb9d83319d58ea511061243437d2805a4c4ae7b [formerly 3d511fe719]
Former-commit-id: 92b7072b82
|
2012-02-23 10:06:18 -06:00 |
|
Steve Harris
|
13a3edd4f6
|
Merging SS OB12.2.1 into ss_sync
Former-commit-id: 829d2791e9 [formerly 8da36046de] [formerly c8aae98741] [formerly 54be9660f1 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]
Former-commit-id: 54be9660f1
Former-commit-id: 411ab8c69637be6b90bd3e06c4b1ab00caea0eec [formerly 4450cf8963]
Former-commit-id: b55a488ed8
|
2012-02-22 11:14:43 -06:00 |
|
Steve Harris
|
5ee70f0f28
|
Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 60b350f7f2 [formerly 695e2979c3] [formerly 1002555dbd] [formerly f693b6d0a7 [formerly 1002555dbd [formerly d31ccf5832bf2b2ccfe29126deb4da80806c6739]]]
Former-commit-id: f693b6d0a7
Former-commit-id: ad66d263d16a34b9108e5df9e52a2625e742ad07 [formerly f650243958]
Former-commit-id: 93e856457b
|
2012-02-09 08:54:18 -06:00 |
|
Matt Nash
|
628da725c1
|
Issue #26 fix classes using HandlerUtil.getActiveEditor() for tear off menus
Former-commit-id: e512d27770 [formerly a659029ea0] [formerly f4c5d7f94b] [formerly 28e3da498e [formerly f4c5d7f94b [formerly c12bae0a615198f6d409cf5e6d79a6a32e57494d]]]
Former-commit-id: 28e3da498e
Former-commit-id: d0e84e05ac9aabb1cf0f0936159cb5c6919bb005 [formerly ef18b8c47f]
Former-commit-id: 8dbb17b2e8
|
2012-02-07 11:45:28 -06:00 |
|
Ben Steffensmeier
|
460820bac9
|
Issue #230 fix scaling problems with printing to high dpi printers
Change-Id: I64e609d3b01a839d3b8927eedfd85f81ffc0301f
Former-commit-id: 15afb5b8bd [formerly 89b327974a] [formerly d35d365b7f] [formerly f78fa301a8 [formerly d35d365b7f [formerly 22418489fd697c94b2350d79e7701c8399842e2e]]]
Former-commit-id: f78fa301a8
Former-commit-id: 968bdeb040264a08ad8cd18803cb98f7c769e7e9 [formerly 55689025ff]
Former-commit-id: 25adbef6ab
|
2012-02-03 12:49:59 -06:00 |
|
Matt Nash
|
fa4cd88c90
|
Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 21d2361f00 [formerly 1faae42484]
Former-commit-id: 82300ccdcf
|
2012-01-19 11:53:12 -06:00 |
|
root
|
9bb8decbcf
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 377dcd10b9 [formerly 3360eb6c5f]
Former-commit-id: 8e80217e59
|
2012-01-06 08:55:05 -06:00 |
|