Commit graph

8 commits

Author SHA1 Message Date
Richard Peter
930ff50fb8 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: 8a78f99345016db3d38c0b846a8a6ccf77fb3e89
2013-05-21 12:11:21 -05:00
Steve Harris
92152778b9 13.4.1-10 baseline
Former-commit-id: bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4
2013-05-20 10:52:47 -04:00
Bryan Kowal
edaa921699 Issue #1927 - fix CAVE dependency tree
Change-Id: Ic9a8a58ec8992cb91980d14f3c1a92573170f6f1

Former-commit-id: 0567e633bc2e41d2052ea13401ba7f6baa8900aa
2013-05-06 23:02:36 -05:00
Steve Harris
06b8eb8db0 13.1.2-8 baseline
Former-commit-id: c8797ef99646b2e093ad60cb9a6ee9643405a13f
2013-01-11 16:19:07 -05:00
Steve Harris
42189b5f88 13.1.2-7 baseline
Former-commit-id: 0c4514d3be8e7dee89a2abe903b51155a2895fd4
2013-01-11 16:12:09 -05:00
Steve Harris
2a216f333c 12.4.1-4 baseline
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
2012-04-18 15:18:16 -05:00
Roger Ferrel
fa42f2dc60 Issue #181
Changes from January ncep_cave

Former-commit-id: 6a878c3c5f400c53d39d7920c0619362aaafb946
2012-01-26 09:26:07 -06:00
root
06a8b51d6d Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
2012-01-06 08:55:05 -06:00