Brian.Dyke 4ac24af0a9 Merge branch 'master_14.2.4' into master_14.3.1 ... Conflicts: cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template Former-commit-id: acf00264f4 [formerly 5c2079dd25181c68f872691e81842aff0f696f8d] Former-commit-id: aae68215c8		2014-11-06 12:55:21 -05:00
..
.settings	Issue #346: Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs.	2012-02-23 13:23:59 -06:00
META-INF	Issue #2984 remove unnecessary dependencies on edex	2014-04-21 11:32:41 -05:00
res	13.5.1-4 baseline	2013-06-28 09:46:25 -04:00
src/com/raytheon/uf/common/dataplugin/gfe	Merge branch 'master_14.2.4' into master_14.3.1	2014-11-06 12:55:21 -05:00
test/com/raytheon/uf/common/dataplugin/gfe	Issue #3069 Fix contour tool issues caused by GeoTools 10.5 update	2014-05-20 11:10:26 -05:00
utility/common_static/base	VLab Issue #4669 - Add Beach Hazards Statement (RM 13467); fixes #4669	2014-09-24 20:11:29 +00: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
.pydevproject	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
build.properties	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
com.raytheon.uf.common.dataplugin.gfe.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00