awips2/cave/com.raytheon.uf.viz.core
Steve Harris 8fb747ad27 Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
	edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5

Former-commit-id: 2f2958df37 [formerly d4dc1723c1] [formerly 2f2958df37 [formerly d4dc1723c1] [formerly 7acd9ab2dd [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]]
Former-commit-id: 7acd9ab2dd
Former-commit-id: 7fb4663d75 [formerly dcbab5621f]
Former-commit-id: 71357da9d2
2014-07-01 11:08:46 -04:00
..
.settings Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
localization/colorfile Issue #2033 Moved some localization files from build.cave to plugins they are used in. Fixed CAVELocalizationAdapter to search all plugins when file not found in base etc folder for cave static base 2013-08-09 14:24:49 -05:00
META-INF Issue #2725 Move derived parameters logic to common 2014-04-09 09:31:12 -05:00
res/spring Issue #2602 Switch around the order of some things on startup to make thinclient better. 2013-12-11 12:45:11 -06:00
schema Issue #2277 Got rid of all ScriptCreator references in raytheon code. 2013-09-12 10:10:04 -05:00
scriptTemplates Issue #2277 Got rid of all ScriptCreator references in raytheon code. 2013-09-12 10:10:04 -05:00
src/com/raytheon Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1 2014-07-01 11:08:46 -04:00
.classpath Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
.project Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
build.properties Issue #2033 Moved some localization files from build.cave to plugins they are used in. Fixed CAVELocalizationAdapter to search all plugins when file not found in base etc folder for cave static base 2013-08-09 14:24:49 -05:00
com.raytheon.uf.viz.core.ecl 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
config.xml 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
logback-viz-core-developer.xml Issue #2142 initial cutover from log4j to SLF4J and logback 2013-07-01 14:41:05 -05:00
logback-viz-core.xml Issue #2142 enable scan of logback config so cave doesn't need to be restarted if logging config changes 2013-08-29 18:03:03 -05:00
plugin.xml Issue #2363 Add General implementation od IColormapShadedShapeExtension so that all targets will be able to render filled wind barbs. 2014-01-23 12:41:16 -06:00