Mirror of Unidata's AWIPS2.

Richard Peter a0b6ea8bb2 Merge branch 'omaha_14.1.1' (14.1.1-11) into development ... Conflicts: cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a Former-commit-id: b09f1559254f06a82afa91f0cc14c8150f88ce64		2013-12-05 12:12:27 -06:00
cave	Merge branch 'omaha_14.1.1' (14.1.1-11) into development	2013-12-05 12:12:27 -06:00
cots	Issue #2214 - restoring the libjep.so files I clobbered in the omaha_14.1.1 -> development merge	2013-11-19 10:08:45 -06:00
cotsSource/org.apache.qpid	13.5.1-7 baseline	2013-07-18 12:07:22 -04:00
deltaScripts	Merge "Issue #1736 Add registry bandwidth tracking Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6" into development	2013-12-04 12:00:40 -06:00
edexOsgi	Merge branch 'omaha_14.1.1' (14.1.1-11) into development	2013-12-05 12:12:27 -06:00
javaUtilities	Issue #2359 add ability to ignore messages based on threads, ie ignore	2013-11-22 15:54:22 -06: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	14.1.1-4 baseline	2013-10-28 10:55:16 -04:00
MHSEmulator	Issue #2009: Fix NullPointerException in SocketServer start up.	2013-07-23 13:57:38 -05:00
msi	Merge branch 'omaha_14.1.1' (14.1.1-11) into development	2013-12-05 12:12:27 -06:00
nativeLib	Merge branch 'omaha_14.1.1' (14.1.1-11) into development	2013-12-05 12:12:27 -06:00
ncep	Issue #2551: Update NCEP objects to extend PersistablePluginDataObject.	2013-12-03 17:24:01 -06:00
ost	14.1.1-7 baseline	2013-11-06 14:16:14 -05:00
pythonPackages	Merge branch 'omaha_14.1.1' (14.1.1-11) into development	2013-12-05 12:12:27 -06:00
RadarServer	Merge branch 'development' into development_on_RHEL6	2013-11-12 11:11:36 -06:00
rpms	Merge branch 'omaha_14.1.1' (14.1.1-11) into development	2013-12-05 12:12:27 -06:00
testProcedures/testDocuments	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
tests	Issue #2331 Fixed Topo retrieval for smartTools/procedures	2013-12-04 17:10:48 -06:00
tools	12.9.1-5 baseline	2012-08-21 15:27:03 -05:00
.gitignore	Fix the git ignore file	2012-09-14 12:04:24 -05:00