Commit graph

8 commits

Author SHA1 Message Date
Richard Peter
7966576f23 Merge branch 'omaha_13.4.1' (13.4.1-11) into development
Conflicts:
	ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java
	ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/RscBundleDisplayMngr.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageDisplay.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageResource.java
	ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/imageProperties/ImagingDialog.java
	ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.viz.ui.display/src/gov/noaa/nws/ncep/viz/ui/display/NCDisplayPane.java

Former-commit-id: 3d84e1dd53 [formerly 8aa4b0025c] [formerly 3d84e1dd53 [formerly 8aa4b0025c] [formerly 930ff50fb8 [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]]
Former-commit-id: 930ff50fb8
Former-commit-id: 76f11f00ae [formerly 81ae3ea8bf]
Former-commit-id: 046de916fd
2013-05-21 12:11:21 -05:00
Steve Harris
b41118326c 13.4.1-10 baseline
Former-commit-id: 68fe2134b8 [formerly 9a403b3615] [formerly 68fe2134b8 [formerly 9a403b3615] [formerly 92152778b9 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]]
Former-commit-id: 92152778b9
Former-commit-id: 7e04d8cd13 [formerly b1fc4e625b]
Former-commit-id: 322036ea82
2013-05-20 10:52:47 -04:00
Bryan Kowal
8bf189dd4e Issue #1927 - fix CAVE dependency tree
Change-Id: Ic9a8a58ec8992cb91980d14f3c1a92573170f6f1

Former-commit-id: 1b7e7f5d3d [formerly d66d7b5968] [formerly 1b7e7f5d3d [formerly d66d7b5968] [formerly edaa921699 [formerly 0567e633bc2e41d2052ea13401ba7f6baa8900aa]]]
Former-commit-id: edaa921699
Former-commit-id: 62e365532d [formerly 088f53aab8]
Former-commit-id: 42bd243967
2013-05-06 23:02:36 -05:00
Steve Harris
92f1e9416c 13.1.2-8 baseline
Former-commit-id: b864fdc303 [formerly e6217a17de] [formerly b864fdc303 [formerly e6217a17de] [formerly 06b8eb8db0 [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]]
Former-commit-id: 06b8eb8db0
Former-commit-id: 7d0109a349 [formerly 3caf592e83]
Former-commit-id: 066c14dcd2
2013-01-11 16:19:07 -05:00
Steve Harris
1ef10eaf2c 13.1.2-7 baseline
Former-commit-id: a8d90da9c0 [formerly 4f86b07eb0] [formerly a8d90da9c0 [formerly 4f86b07eb0] [formerly 42189b5f88 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]]
Former-commit-id: 42189b5f88
Former-commit-id: f1256f2a9e [formerly b7f1dbe72b]
Former-commit-id: 775a338b90
2013-01-11 16:12:09 -05:00
Steve Harris
74b66d9683 12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae [formerly a4e519f3cd]
Former-commit-id: 8cd5974f4c
2012-04-18 15:18:16 -05:00
Roger Ferrel
80b5a2049b Issue #181
Changes from January ncep_cave

Former-commit-id: ae0981ac0f [formerly 7427aeaf29] [formerly ae0981ac0f [formerly 7427aeaf29] [formerly fa42f2dc60 [formerly 6a878c3c5f400c53d39d7920c0619362aaafb946]]]
Former-commit-id: fa42f2dc60
Former-commit-id: 9475b22c54 [formerly 376f6868b6]
Former-commit-id: 0d2ef82d19
2012-01-26 09:26:07 -06:00
root
e2ecdcfe33 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 8e80217e59 [formerly 3360eb6c5f]
Former-commit-id: 377dcd10b9
2012-01-06 08:55:05 -06:00