mjames-upc
e68a98374f
removing LDAD components
2016-01-07 10:53:31 -07:00
mjames-upc
0b01029e68
cleaning up unidata_15.1.1 enough to launch in eclipse
2015-12-29 20:15:31 -07:00
mjames-upc
136fd6354b
awips/fxa to awips2/fxa
...
Former-commit-id: c810a506f3
2015-11-05 15:44:44 -07:00
AWIPS User
16e039e763
move 0-3hr Prob CG Lightning to baseSPC menu
...
Former-commit-id: 3395fd09ae
2015-09-21 14:19:01 -06:00
AWIPS User
1e613dabe7
further menu edits
...
Former-commit-id: c7a75b70e8
2015-09-19 19:54:01 -06:00
Jingtao Deng
0dea4811cd
VLab Issue #8200 - DR17493 Saving a Selected Preset in Hydro PDC does not function; fixes #8200
...
Change-Id: I3fb9a7e43057f374a3d055a3ab294eca094a16cb
Former-commit-id: f4cfa77511b9d887006582da8dc7dd4f044b4d3e
2015-05-15 16:04:48 -04:00
Fay.Liang
2eb8777058
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
...
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
edexOsgi/build.edex/edex/common.properties
Former-commit-id: ba576b948587ea7b1c077ebad7113bc4e7504c00
2015-03-19 12:35:31 -04:00
Loubna.Bousaidi
4974dc548f
ASM #13998 Fixed precip data display
...
Change-Id: I65081bf5bd80acfca6d4a06e4305822757b3684f
Former-commit-id: 9725611882fb36228c5fd815d216878c5070a5d0
2015-03-09 18:57:03 +00:00
Chris Cody
0619aac7fd
Omaha #4075 Export Hydro Resources package for Hazard Services
...
Change-Id: I04d312f42859a0fcc840d04d685700487204e99c
Former-commit-id: 555795af65c5f138fdf6250752861452297a7f4b
2015-02-02 14:52:48 -06:00
Xuezhi.Wei
ac19b4b08d
ASM #634 - Missing Data not getting into HML file
...
Change-Id: I4f2358f28ef7d7945813cbffa6d36517e162e40b
Former-commit-id: 947f9dd3435219ff32890cc4a26d8ae5e43686cf
2014-12-08 20:48:40 +00:00
Xuezhi.Wei
f7e83f5859
ASM #634 - Missing Data not getting into HML file
...
Change-Id: I4f2358f28ef7d7945813cbffa6d36517e162e40b
Former-commit-id: e40018f2e1ac19b4b08dac19b4b08dc0a72e92bf
2014-12-08 20:48:40 +00:00
Steve Harris
7692e3f21d
Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java
Former-commit-id: 72f387d2802c12eedfe5643616fe5a54420aef66
2014-09-23 11:41:10 -05:00
Steve Harris
db4aa1cebe
Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java
Former-commit-id: b979960b7b7692e3f21d7692e3f21d2e2072a963
2014-09-23 11:41:10 -05:00
Chip Gobs
8c6e70ccab
VLab Issue #4611
...
Fixes O&M Redmine DR 14448 - which concerns displaying changes to a color set just after the changes are saved,
instead of after the ColorScaleManager is closed.
Change-Id: I0156612302853141392c263eab8b54a16c3be7a3
Former-commit-id: 44f6bf08a72b5450d6d0db40ff49dd5123cf811c
2014-09-08 12:06:45 -04:00
Chip Gobs
a465c9964c
VLab Issue #4611
...
Fixes O&M Redmine DR 14448 - which concerns displaying changes to a color set just after the changes are saved,
instead of after the ColorScaleManager is closed.
Change-Id: I0156612302853141392c263eab8b54a16c3be7a3
Former-commit-id: 25e4ed8d518c6e70ccab8c6e70ccab69450976c8
2014-09-08 12:06:45 -04:00
Nate Jensen
b3083a663e
Omaha #3356 cleanup of unnecessary register buddies and buddy policies
...
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0
Former-commit-id: 48536dd79d933508ac54b3b6e9bbd166fd218330
2014-08-14 10:22:37 -05:00
Nate Jensen
d61c65787b
Omaha #3356 cleanup of unnecessary register buddies and buddy policies
...
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0
Former-commit-id: 9b72a1399db3083a663eb3083a663e253198b5bc
2014-08-14 10:22:37 -05:00
Mark Peters
1b5b707601
Omaha #3489 Replace Raytheon plugin calls to deprecated IGraphicsTarget.getStringBounds()
...
Change-Id: Ie4c6093ff96e88332b719b9f88434bdd128770ea
Former-commit-id: 331b5994cc4bcd95138b15461b5040004f03d3fd
2014-08-05 14:30:06 -05:00
Mark Peters
64bd91788b
Omaha #3489 Replace Raytheon plugin calls to deprecated IGraphicsTarget.getStringBounds()
...
Change-Id: Ie4c6093ff96e88332b719b9f88434bdd128770ea
Former-commit-id: 7d82d522e41b5b7076011b5b70760190be52aac1
2014-08-05 14:30:06 -05:00
Nate Jensen
6e94ea9d2b
Omaha #3356 remove registering buddies to viz.volumebrowser and viz.ui
...
since those plugins don't even have buddy policies
Change-Id: Ib81ac30111b9c3020e486d6db52dde3e15d7dacf
Former-commit-id: 4f691341c0368c3e015c73f25aab0cf8877802ac
2014-08-04 18:03:15 -05:00
Nate Jensen
f83883f478
Omaha #3356 remove registering buddies to viz.volumebrowser and viz.ui
...
since those plugins don't even have buddy policies
Change-Id: Ib81ac30111b9c3020e486d6db52dde3e15d7dacf
Former-commit-id: f8d92351046e94ea9d2b6e94ea9d2b92b1fb11e5
2014-08-04 18:03:15 -05:00
Mark Peters
ad794f8fba
Omaha #3465 Replace plugin calls to deprecated IGraphicsTarget.drawStrings()
...
Change-Id: Ib72cf8806852aff718af56c5f2c2cf4e07f9f548
Former-commit-id: 29d170af7a0c36e614a84923c2fb5054db73c390
2014-07-30 16:03:57 -05:00
Mark Peters
90a74cb89b
Omaha #3465 Replace plugin calls to deprecated IGraphicsTarget.drawStrings()
...
Change-Id: Ib72cf8806852aff718af56c5f2c2cf4e07f9f548
Former-commit-id: 47aec2aae3ad794f8fbaad794f8fbab40e589488
2014-07-30 16:03:57 -05:00
Nate Jensen
205e491d71
Omaha #3266 remove unused attributes and elements from baseline menu xml
...
files
Change-Id: I1a1f75f2b2a314679487ddf719f4f0055bdf8d01
Former-commit-id: 797504a970ec39c4fd56c9e0d51b292acfceea1b
2014-06-10 18:30:14 -05:00
Nate Jensen
7783919a76
Omaha #3266 remove unused attributes and elements from baseline menu xml
...
files
Change-Id: I1a1f75f2b2a314679487ddf719f4f0055bdf8d01
Former-commit-id: 955e115c00205e491d71205e491d7123f3a15f31
2014-06-10 18:30:14 -05:00
brian.dyke
011d121e4b
Merge branch 'master_14.3.1-4' into asm_14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Former-commit-id: 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199
2014-05-19 09:45:37 -04:00
brian.dyke
4d161aaf90
Merge branch 'master_14.3.1-4' into asm_14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Former-commit-id: 58683ad040011d121e4b011d121e4b9626317825
2014-05-19 09:45:37 -04:00
Loubna.Bousaidi
ec5bd7a2bb
ASM #527 update revision and shef_qual_code
...
Change-Id: I36fa41796350e8fcae6bcc0101120331188bbeff
Former-commit-id: 860ea4b3644a526ac10b4366f158824fe6cbdcb0
2014-05-12 18:42:12 +00:00
Loubna.Bousaidi
6b73f20d22
ASM #527 update revision and shef_qual_code
...
Change-Id: I36fa41796350e8fcae6bcc0101120331188bbeff
Former-commit-id: d3be6d0476ec5bd7a2bbec5bd7a2bbe634d0cdcf
2014-05-12 18:42:12 +00:00
Nate Jensen
a37a2afe18
Issue #2060 dropping grid dataURI column
...
Change-Id: I8b8ba3f2ec71e15aa3c40e7eab42525dbf09157e
Former-commit-id: 1aab87d9572089a09351ebdfb8fbcef884866feb
2014-04-21 17:34:39 -05:00
Nate Jensen
03451ab6b2
Issue #2060 dropping grid dataURI column
...
Change-Id: I8b8ba3f2ec71e15aa3c40e7eab42525dbf09157e
Former-commit-id: 5dfb652775a37a2afe18a37a2afe18263611f905
2014-04-21 17:34:39 -05:00
Richard Peter
3575d6586f
Merge branch 'omaha_14.2.2' (14.2.2-3) into development
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Former-commit-id: bd13bc332bcdd87723bec8669885f4594ad483b9
2014-04-11 16:23:09 -05:00
Richard Peter
9b12d9ddaf
Merge branch 'omaha_14.2.2' (14.2.2-3) into development
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Former-commit-id: 21ae3b5fcd3575d6586f3575d6586fcd51f3fa87
2014-04-11 16:23:09 -05:00
Lee Venable
64f5da88ff
Issue #2970 - added SWT dispose checks to runAsync methods.
...
Former-commit-id: b07ebb73405c3421c6afa3e45db57162a7ca622b
2014-03-31 16:06:59 -05:00
Lee Venable
bd8d4feea2
Issue #2970 - added SWT dispose checks to runAsync methods.
...
Former-commit-id: 4714913a8c64f5da88ff64f5da88ff91c1cc0e2a
2014-03-31 16:06:59 -05:00
David Friedman
fd900e38c2
Merge branch 'master_14.2.2' into asm_14.2.2
...
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.
Conflicts:
cave/build/static/linux/cave/cave.sh
cave/build/static/linux/cave/caveUtil.sh
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d
Former-commit-id: cf35c1870fc4b6b3c2ceaf038274c4701f8046b1
2014-03-27 19:17:03 +00:00
David Friedman
ee37afaf7b
Merge branch 'master_14.2.2' into asm_14.2.2
...
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.
Conflicts:
cave/build/static/linux/cave/cave.sh
cave/build/static/linux/cave/caveUtil.sh
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d
Former-commit-id: f146c7bcd0fd900e38c2fd900e38c232a7adbe4b
2014-03-27 19:17:03 +00:00
Max Schenkelberg
dbcbd1b560
Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done.
...
Change-Id: If27cd7c8e11cdc6287303e6d5fc1f4990e300ada
Former-commit-id: 51664693bd87df52acdb74d5286b61eeb06b792d
2014-03-03 17:59:48 -06:00
Max Schenkelberg
4bcdc9f85b
Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done.
...
Change-Id: If27cd7c8e11cdc6287303e6d5fc1f4990e300ada
Former-commit-id: 1854bbb477dbcbd1b560dbcbd1b5606edfb8965f
2014-03-03 17:59:48 -06:00
Richard Peter
0e25ae35c1
Merge branch 'omaha_14.2.1' (14.2.1-8) into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java
Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75
Former-commit-id: a47eaa9af45db41391fe46e36ec0793f70d06ad6
2014-02-27 15:18:26 -06:00
Richard Peter
79d3aa4e1a
Merge branch 'omaha_14.2.1' (14.2.1-8) into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java
Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75
Former-commit-id: 1c150e6e8b0e25ae35c10e25ae35c17bd6a07913
2014-02-27 15:18:26 -06:00
Mike Duff
a6509aad8c
Issue #2596 - Add check for null coordinates.
...
Change-Id: I18f7a129ec428e51b36ac5b76cae194cf2c01e75
Former-commit-id: 11f3705080210161e6915309a4aec423b307cce8
2014-02-18 17:32:32 -06:00
Mike Duff
a370e81065
Issue #2596 - Add check for null coordinates.
...
Change-Id: I18f7a129ec428e51b36ac5b76cae194cf2c01e75
Former-commit-id: 9754f0d8dda6509aad8ca6509aad8c283b0c670c
2014-02-18 17:32:32 -06:00
Ron Anderson
32bcf9d0d0
Merge branch 'master_14.1.1' into master_14.2.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
rpms/awips2.core/Installer.tools/component.spec
Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4
Former-commit-id: 4155b9785e0a82078db6805659146980cafc2aa7
2014-02-18 10:45:20 -06:00
Ron Anderson
410f956cff
Merge branch 'master_14.1.1' into master_14.2.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
rpms/awips2.core/Installer.tools/component.spec
Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4
Former-commit-id: 14a082a4e932bcf9d0d032bcf9d0d0e7f2b6883d
2014-02-18 10:45:20 -06:00
Loubna.Bousaidi
e3168d08cf
ASM #85
...
Change-Id: I782bbebc746425446c523b6b4db026d81f85b2da
Former-commit-id: 4d7d62ed986a781fb225775d2446740453bd8c89
2014-02-11 22:12:48 +00:00
Loubna.Bousaidi
e985e9d296
ASM #85
...
Change-Id: I782bbebc746425446c523b6b4db026d81f85b2da
Former-commit-id: 55d8f64139e3168d08cfe3168d08cffe1c94a422
2014-02-11 22:12:48 +00:00
Brian.Dyke
575e328123
14.1.1-18 baseline
...
Former-commit-id: a8009c4ee3effc8586b830244db8db716ec0f37c
2014-02-11 15:52:50 -05:00
Brian.Dyke
1f27652aa3
14.1.1-18 baseline
...
Former-commit-id: 1d6a9456b7575e328123575e328123f05a2220cd
2014-02-11 15:52:50 -05:00
Brian.Dyke
180d1356cd
14.1.1-17 baseline
...
Former-commit-id: 810229668fd7ff81b5c426161d496fc62e24b75c
2014-02-04 12:33:46 -05:00
