Bradley Mabe c16678bf45 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: 3d3cecdeb7bc191fa10e7bcb6e4791cab34daadc		2015-08-25 09:55:26 -04:00
..
META-INF	Omaha #3133 remove unnecessary register buddies	2014-06-23 14:13:19 -05:00
res/spring	Merge tag 'OB_14.4.1-20m' into omaha_15.1.1	2015-03-26 09:57:17 -05:00
resources	Omaha #4103: Update GFE service backup server code to support multiple service backup sites, use "smarter" lock files to store additional status.	2015-03-19 16:13:56 -05:00
src/com/raytheon/edex/plugin/gfe	Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into int_15.1.1	2015-06-01 08:59:15 -04: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	Issue #2208 moving edex unit tests to tests project	2013-07-25 12:29:46 -05:00
.project	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
.pydevproject	13.3.1-12 baseline	2013-03-25 13:27:13 -05:00
build.properties	Omaha #4518: ISC_Send_Area is always at least a union of ISC and FireWXAOR edit areas.	2015-05-21 15:01:03 -05:00
com.raytheon.edex.plugin.gfe.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00
plugin-deploy.groovy	Issue #1924 - standardize build.properties files	2013-06-13 16:04:18 -05:00