Steve Harris 85055fcc53 Merge branch 'omaha_16.2.1' into omaha_16.2.2 ... Conflicts: cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatedata/ClimateDataMenuDlg.java cave/com.raytheon.viz.awipstools/localization/menus/tools/baseToolsMenu.xml cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java Former-commit-id: 68c13f9160746f365bd5f896b1400f1a8099ebe8		2016-02-01 11:57:52 -06:00
..
META-INF	Omaha #5166: Update logging to use SLF4J: com.raytheon.edex.plugin.gfe	2015-12-15 15:42:12 -06:00
res/spring	Omaha #4262: Run GFESiteActivation off main EDEX thread.	2016-01-04 10:12:14 -06: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	Omaha #5237 Replace deprecated LocalizationFile method calls	2016-01-27 16:52:52 -06:00
utility	Merge branch 'omaha_16.2.1' into omaha_16.2.2	2016-02-01 11:57:52 -06: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	Merge tag 'OB_15.1.1-16' into omaha_16.1.1	2015-06-05 15:38:00 -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