Richard Peter cc60be39d7 Merge branch 'omaha_14.2.2' (14.2.2-3) into development ... Conflicts: cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml Former-commit-id: 0fa9c8709a [formerly 9b12d9ddaf] [formerly cd51f3fa87] [formerly cd51f3fa87 [formerly 3575d6586f]] [formerly 0fa9c8709a [formerly 9b12d9ddaf] [formerly cd51f3fa87] [formerly cd51f3fa87 [formerly 3575d6586f]] [formerly 21ae3b5fcd [formerly cd51f3fa87 [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]]] Former-commit-id: 21ae3b5fcd Former-commit-id: a655029277 [formerly 56089894f2] [formerly d65b11d404] [formerly cba185d0d926f9dea67500ef8d8ab9da489ee4bb [formerly 9377474013cb8e8722b3a32e83523c417b87fcd0] [formerly d65b11d404 [formerly a7ec0bcf66]]] Former-commit-id: 70c651ece580f217c6e5e6df78b1cbb6c5cec4c5 [formerly ea5917ddde80aa4f2fa095272512ef873794f21c] [formerly a22345ea6b [formerly b6482f2e54]] Former-commit-id: e0178e9061d12ecb24c62f10b17719ef0668f099 [formerly a22345ea6b] Former-commit-id: 626ab0bd58		2014-04-11 16:23:09 -05:00
..
.settings	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
META-INF	Issue #2361 once again try to remove more common ISerializableObject	2013-10-23 11:40:13 -05:00
src/com/raytheon/uf/common/dataplugin/acarssounding	Issue #2638 wrote java utility for generating list of data URIs and	2014-02-27 17:14:32 -06:00
utility/common_static/base/stations	ASM #78 - Fix MDCRS display	2014-02-27 12:48:09 -05:00
.classpath	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
.project	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
build.properties	13.1.2-2 baseline	2013-01-06 14:32:24 -06:00
com.raytheon.uf.common.dataplugin.acarssounding.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00