Mirror of Unidata's AWIPS2.

Steve Harris 92b45da5de Merge branch 'omaha_14.3.1' into omaha_14.4.1 ... Conflicts: cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/scales/MapScalesManager.java cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/AlarmDisplayWindow.java cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/LocalizationStreamHandler.java edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py Former-commit-id: 50461a5ba1 [formerly d606269c5b] [formerly a92dc418c6] [formerly a92dc418c6 [formerly 0fb743ec44]] [formerly bf9a0fa5de [formerly a92dc418c6 [formerly 0fb743ec44] [formerly bf9a0fa5de [formerly f7d474895366eb23ae5eef242a4568f911435aa3]]]] Former-commit-id: bf9a0fa5de Former-commit-id: dc33a08694848cdc72e0b1d1b867cfe2d678d9a2 [formerly af44a55101128b715bc6595cfc378e8fcdc2eb3d] [formerly b848e05aa1 [formerly 46fe792d83]] Former-commit-id: b848e05aa1 Former-commit-id: 386dfebe65		2014-08-04 22:20:29 -05:00
cave	Merge branch 'omaha_14.3.1' into omaha_14.4.1	2014-08-04 22:20:29 -05:00
deltaScripts	Omaha #3318 split deltascript one for dx1 the other for dx2.	2014-08-01 14:13:25 -05:00
edexOsgi	Merge branch 'omaha_14.3.1' into omaha_14.4.1	2014-08-04 22:20:29 -05:00
javaUtilities	Omaha #3275 - moving developer tools to separate repository	2014-06-25 16:16:03 -05:00
ldm	13.2.1-2 baseline	2013-01-23 11:18:44 -05:00
localApps	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00
localization	Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP.	2014-05-09 09:34:49 -05:00
msi	Issue #2851 - 64-bit Windows build updates; also supports 32-bit builds	2014-03-31 12:37:37 -05:00
nativeLib	Merge branch 'omaha_14.3.1' into omaha_14.4.1	2014-08-04 22:20:29 -05:00
ncep	Omaha #3410 removed duplicate fields from hdf5	2014-07-31 10:23:26 -05:00
ohd	Omaha #3165 fix bad manifests	2014-07-10 09:20:24 -05:00
ost	Omaha #3226 fixed lightning decrypt validation, added initialization vector	2014-06-19 10:32:05 -05:00
pythonPackages	Omaha #3184 renamed valid identifiers to optional	2014-07-31 09:45:01 -05:00
RadarServer	Omaha #3309 - Remove reference to slf4j-log4j library	2014-06-26 11:34:47 -05:00
rpms	Omaha #2735 - force the unpack of jface during CAVE installation.	2014-07-23 19:19:14 -05:00
testProcedures/testDocuments	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
tests	Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1	2014-07-01 15:34:39 -05:00
.gitignore	Fix the git ignore file	2012-09-14 12:04:24 -05:00