xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/edexOsgi/com.raytheon.uf.common.dataplugin.gfe
History
Steve Harris 196f53e609 CM-MERGE:14.1.3-2,-3 into 14.2.2 
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java

Former-commit-id: 16f5ff0979 [formerly b84dda5930] [formerly 16f5ff0979 [formerly b84dda5930] [formerly 419c5f4aba [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]]
Former-commit-id: 419c5f4aba
Former-commit-id: af06c5a890 [formerly 66d30e59a3]
Former-commit-id: 935542914d
2014-06-20 14:01:55 -04: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 #2361 once again try to remove more common ISerializableObject 2013-10-23 11:40:13 -05:00
res 13.5.1-4 baseline 2013-06-28 09:46:25 -04:00
src/com/raytheon/uf/common/dataplugin/gfe CM-MERGE:14.1.3-2,-3 into 14.2.2 2014-06-20 14:01:55 -04:00
test/com/raytheon/uf/common/dataplugin/gfe Issue #1571 Refactored GFE to store GridParmInfo and ParmStorageInfo in PostGres 2013-08-20 17:16:21 -05:00
utility/common_static/base Issue #2404 Moved colormap parameter factory to common 2013-09-27 09:41:51 -05: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