Bradley Mabe d05d3909f0 Merge remote branch 'origin/ncep_14.4.1-n' into ncep_15.1.1-n ... Conflicts: cave/build/p2-build.xml cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/edex_static/base/viirs/viirsHeaderMapping.xml Former-commit-id: c16678bf45 [formerly 3d3cecdeb7bc191fa10e7bcb6e4791cab34daadc] Former-commit-id: 48c980abe8		2015-08-25 09:55:26 -04:00
..
META-INF	Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter.	2014-03-07 18:15:32 -06:00
res/spring	Issue #2726: Edex graceful shutdown.	2014-04-14 13:10:11 -05:00
src/com/raytheon/uf/edex/plugin/npp/viirs	Omaha #3454 Upgrading to Hibernate 4.2.15	2014-10-20 12:42:19 -05:00
utility	Merge remote branch 'origin/ncep_14.4.1-n' into ncep_15.1.1-n	2015-08-25 09:55:26 -04:00
.classpath	12.11.1-4 baseline	2012-10-16 13:27:07 -05:00
.project	12.11.1-4 baseline	2012-10-16 13:27:07 -05:00
build.properties	12.11.1-4 baseline	2012-10-16 13:27:07 -05:00
com.raytheon.uf.edex.plugin.npp.viirs.ecl	12.11.1-4 baseline	2012-10-16 13:27:07 -05:00