awips2/ncep/gov.noaa.nws.ncep.edex.plugin.solarimage
Stephen Gilbert 86953e803e Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
Conflicts:
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml

Change-Id: Id609c4bd0e120f357b15c8a859ec0ece54ed47e0

Former-commit-id: 14258764bd [formerly 91d469eb90] [formerly 7992a6b15b [formerly 42eab5bcfeae6a2e1db32b83a68249bb37c9584e]]
Former-commit-id: 7992a6b15b
Former-commit-id: 7aaf3f44bc
2014-05-22 12:39:09 -04:00
..
.settings 13.1.2-7 baseline 2013-01-11 16:12:09 -05:00
META-INF Issue #2142 Got log4j out of edex. 2013-07-15 14:26:15 -05:00
res/spring Issue #2726: Edex graceful shutdown. 2014-04-14 13:10:11 -05:00
src/gov/noaa/nws/ncep/edex/plugin/solarimage VLab Issue #3722 - SWPC delivery for 14.3.1 2014-05-15 17:24:13 -04:00
utility VLab Issue #2866 - EDEX and EDEX Common delivery for 14.2.1 2014-01-24 10:14:17 -05:00
.classpath 13.1.2-7 baseline 2013-01-11 16:12:09 -05:00
.project 13.1.2-7 baseline 2013-01-11 16:12:09 -05:00
build.properties 13.1.2-7 baseline 2013-01-11 16:12:09 -05:00
gov.noaa.nws.ncep.edex.plugin.solarimage.ecl 13.1.2-7 baseline 2013-01-11 16:12:09 -05:00