xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen
History
David Friedman 8ea6e0b064 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: ee37afaf7b [formerly 32a7adbe4b] [formerly fd900e38c2] [formerly ee37afaf7b [formerly 32a7adbe4b] [formerly fd900e38c2] [formerly f146c7bcd0 [formerly fd900e38c2 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]]
Former-commit-id: f146c7bcd0
Former-commit-id: 1e4ac84f99 [formerly 1168a3eae5] [formerly 06e6f2e7e7ae2f1959eaefcb5e76c2a04c33de99 [formerly 533d15c863]]
Former-commit-id: beb961d5304e2c2df6afc0538bae8011c8b6f63f [formerly dde12b4fc3]
Former-commit-id: 8f8f55dd3c
2014-03-27 19:17:03 +00:00
..
airportWeatherWarning.vm Issue #224 2014-02-04 17:05:12 -05:00
airportWeatherWarning.xml Issue #224 2014-02-04 17:05:12 -05:00
arealFloodAdvisory.vm ASM #224 - WarnGen: OB13.5.2 Template Errors 2014-03-07 14:53:54 -05:00
arealFloodAdvisory.xml Issue #224 2014-02-04 17:05:12 -05:00
arealFloodAdvisoryFollowup.vm ASM #224 - WarnGen: OB13.5.2 Template Errors 2014-03-07 14:53:54 -05:00
arealFloodAdvisoryFollowup.xml ASM #224 - WarnGen: OB13.5.2 Template Errors 2014-03-07 14:53:54 -05:00
arealFloodWarning.vm ASM #224 - WarnGen: OB13.5.2 Template Errors 2014-03-07 14:53:54 -05:00
arealFloodWarning.xml Issue #224 2014-02-04 17:05:12 -05:00
arealFloodWarningFollowup.vm ASM #224 - WarnGen: OB13.5.2 Template Errors 2014-03-07 14:53:54 -05:00
arealFloodWarningFollowup.xml Issue #224 2014-02-04 17:05:12 -05:00
burnScarFlashFloodWarning.vm Issue #224 2014-02-04 17:05:12 -05:00
burnScarFlashFloodWarning.xml Issue #224 2014-02-04 17:05:12 -05:00
burnScarFlashFloodWarningFollowup.vm Issue #224 2014-02-04 17:05:12 -05:00
burnScarFlashFloodWarningFollowup.xml Issue #224 2014-02-04 17:05:12 -05:00
burnScarInfo.vm Issue #224 2014-02-04 17:05:12 -05:00
burnScarInfoBullet.xml Issue #224 2014-02-04 17:05:12 -05:00
burnScarInfoBulletName.xml Issue #224 2014-02-04 17:05:12 -05:00
config.vm Issue #224 2014-02-04 17:05:12 -05:00
config.xml Issue #2032 move build.edex's common-static files to appropriate plugins 2013-07-18 09:53:53 -05:00
countyTypes.txt Issue #224 2014-02-04 17:05:12 -05:00
damInfo.vm Issue #224 2014-02-04 17:05:12 -05:00
damInfoBullet.xml Issue #224 2014-02-04 17:05:12 -05:00
damInfoBulletName.xml Issue #224 2014-02-04 17:05:12 -05:00
dssEvents.vm Issue #224 2014-02-04 17:05:12 -05:00
dssEvents.xml Issue #224 2014-02-04 17:05:12 -05:00
dupCounties.vm Issue #224 2014-02-04 17:05:12 -05:00
extremeWindWarning.vm Issue #224 2014-02-04 17:05:12 -05:00
extremeWindWarning.xml Issue #224 2014-02-04 17:05:12 -05:00
extremeWindWarningFollowup.vm ASM #224 - WarnGen: OB13.5.2 Template Errors 2014-03-07 14:53:54 -05:00
extremeWindWarningFollowup.xml Issue #224 2014-02-04 17:05:12 -05:00
fireWarning.vm Issue #224 2014-02-04 17:05:12 -05:00
fireWarning.xml Issue #224 2014-02-04 17:05:12 -05:00
flashFloodWarning.vm ASM #224 - WarnGen: OB13.5.2 Template Errors 2014-03-07 14:53:54 -05:00
flashFloodWarning.xml Issue #224 2014-02-04 17:05:12 -05:00
flashFloodWarningFollowup.vm ASM #224 - WarnGen: OB13.5.2 Template Errors 2014-03-07 14:53:54 -05:00
flashFloodWarningFollowup.xml Issue #224 2014-02-04 17:05:12 -05:00
forecasterName.vm Issue #224 2014-02-04 17:05:12 -05:00
geospatialConfig_COUNTY.xml ASM #224 - WarnGen: OB13.5.2 Template Errors 2014-03-07 14:53:54 -05:00
geospatialConfig_MARINE.xml ASM #224 - WarnGen: OB13.5.2 Template Errors 2014-03-07 14:53:54 -05:00
geospatialConfig_ZONE.xml Issue #224 2014-02-04 17:05:12 -05:00
immediateCause.txt Issue #224 2014-02-04 17:05:12 -05:00
impactSevereThunderstormWarning.vm Issue #224 2014-02-04 17:05:12 -05:00
impactSevereThunderstormWarning.xml Issue #224 2014-02-04 17:05:12 -05:00
impactSevereWeatherStatement.vm Issue #224 2014-02-04 17:05:12 -05:00
impactSevereWeatherStatement.xml Issue #224 2014-02-04 17:05:12 -05:00
impactSpecialMarineWarning.vm Issue #224 2014-02-04 17:05:12 -05:00
impactSpecialMarineWarning.xml Issue #224 2014-02-04 17:05:12 -05:00
impactSpecialMarineWarningFollowup.vm Issue #224 2014-02-04 17:05:12 -05:00
impactSpecialMarineWarningFollowup.xml Issue #224 2014-02-04 17:05:12 -05:00
impactStatements.vm Issue #224 2014-02-04 17:05:12 -05:00
impactTornadoWarning.vm Issue #224 2014-02-04 17:05:12 -05:00
impactTornadoWarning.xml Issue #224 2014-02-04 17:05:12 -05:00
marineWeatherStatement.vm Issue #224 2014-02-04 17:05:12 -05:00
marineWeatherStatement.xml Issue #224 2014-02-04 17:05:12 -05:00
marineWeatherStatementAshfall.vm Issue #224 2014-02-04 17:05:12 -05:00
marineWeatherStatementAshfall.xml Issue #224 2014-02-04 17:05:12 -05:00
mileMarkers.vm Issue #224 2014-02-04 17:05:12 -05:00
mileMarkers.xml Issue #224 2014-02-04 17:05:12 -05:00
nonConvectiveFlashFloodWarning.vm Issue #224 2014-02-04 17:05:12 -05:00
nonConvectiveFlashFloodWarning.xml ASM #224 - WarnGen: OB13.5.2 Template Errors 2014-03-07 14:53:54 -05:00
nonConvectiveFlashFloodWarningFollowup.vm ASM #224 - WarnGen: OB13.5.2 Template Errors 2014-03-07 14:53:54 -05:00
nonConvectiveFlashFloodWarningFollowup.xml ASM #224 - WarnGen: OB13.5.2 Template Errors 2014-03-07 14:53:54 -05:00
officeCityTimezone.txt Issue #224 2014-02-04 17:05:12 -05:00
pointMarkers.vm Issue #224 2014-02-04 17:05:12 -05:00
pointMarkers.xml Issue #224 2014-02-04 17:05:12 -05:00
severeThunderstormWarning.vm Issue #224 2014-02-04 17:05:12 -05:00
severeThunderstormWarning.xml Issue #224 2014-02-04 17:05:12 -05:00
severeWeatherStatement.vm Issue #224 2014-02-04 17:05:12 -05:00
severeWeatherStatement.xml Issue #224 2014-02-04 17:05:12 -05:00
shortTermForecast.vm Issue #224 2014-02-04 17:05:12 -05:00
shortTermForecast.xml Issue #224 2014-02-04 17:05:12 -05:00
significantWeatherAdvisory.vm Issue #224 2014-02-04 17:05:12 -05:00
significantWeatherAdvisory.xml Issue #224 2014-02-04 17:05:12 -05:00
specialMarineWarning.vm Issue #224 2014-02-04 17:05:12 -05:00
specialMarineWarning.xml Issue #224 2014-02-04 17:05:12 -05:00
specialMarineWarningFollowup.vm Merge branch 'master_14.2.2' into asm_14.2.2 2014-03-27 19:17:03 +00:00
specialMarineWarningFollowup.xml Issue #224 2014-02-04 17:05:12 -05:00
specialWeatherStatement.vm Issue #224 2014-02-04 17:05:12 -05:00
specialWeatherStatement.xml Issue #224 2014-02-04 17:05:12 -05:00
states.txt Issue #224 2014-02-04 17:05:12 -05:00
stormReports.vm Issue #224 2014-02-04 17:05:12 -05:00
stormReports.xml Issue #224 2014-02-04 17:05:12 -05:00
tornadoWarning.vm Issue #224 2014-02-04 17:05:12 -05:00
tornadoWarning.xml Issue #224 2014-02-04 17:05:12 -05:00
VM_global_library.vm Merge branch 'master_14.2.2' into asm_14.2.2 2014-03-27 19:17:03 +00:00