Richard Peter
|
8aa4b0025c
|
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
|
9a403b3615
|
13.4.1-10 baseline
Former-commit-id: bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4
|
2013-05-20 10:52:47 -04:00 |
|
Ben Steffensmeier
|
4209e014d8
|
Issue #1869 Remove dataURI column from PluginDataObject.
Change-Id: I3450130d8e68c065683794ba941a83897fe36745
Former-commit-id: 7fd2829cd730562a549a2f3c423ac5ead15872e7
|
2013-05-08 18:39:25 -05:00 |
|
Steve Harris
|
d33e5861aa
|
13.4.1-4 baseline
Former-commit-id: 4477bad886dc7ae0418409e3bc5ebce7965b6146
|
2013-05-02 10:00:38 -05:00 |
|
Brad Gonzales
|
dc37712fda
|
Issue #1857 Added sequence generator annotation to PluginDataObject concrete classes.
Amend: comment updates from peer review.
added sequence delta script.
Change-Id: Id8685fa0790926564d5d575e43a3da24db27dcf1
Former-commit-id: 562c9fa0341d0fb351adb8e57c14f1ce0bc59c95
|
2013-04-16 14:44:06 -05:00 |
|
Steve Harris
|
9be238bcc4
|
13.3.1-19 baseline
Former-commit-id: ce855032b2b7235b2aea8dc66aff89ca7c54854a
|
2013-04-09 08:37:12 -05:00 |
|
Steve Harris
|
3a4c7931e1
|
13.3.1-6 baseline
Former-commit-id: fecc19685d09be66f3eeeee392e565a1ce8b7e65
|
2013-03-12 08:35:45 -05:00 |
|