Richard Peter 506b9ea881 Merge branch 'omaha_13.5.3' (13.5.3-5) into development ... Conflicts: RadarServer/com.raytheon.rcm.feature/feature.xml cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml edexOsgi/build.edex/build.xml edexOsgi/build.edex/esb/conf/log4j-ingest.xml edexOsgi/build.edex/esb/conf/modes.xml edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF edexOsgi/com.raytheon.uf.common.base.feature/feature.xml edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java Change-Id: I6abe6f71ed2a5e641c82274944f1aedb676772f9 Former-commit-id: a43f9b5b32 [formerly 1ba8eb3891] [formerly 25df870b67] [formerly 25df870b67 [formerly fa7d77ae97]] [formerly a43f9b5b32 [formerly 1ba8eb3891] [formerly 25df870b67] [formerly 25df870b67 [formerly fa7d77ae97]] [formerly 93c776022a [formerly 25df870b67 [formerly fa7d77ae97] [formerly 93c776022a [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]]]] Former-commit-id: 93c776022a Former-commit-id: 447789f1a1 [formerly aec254aac0] [formerly c97efbf656] [formerly c13fde9952c4d04bb5a99e02ea658bf020889a28 [formerly 23d0b9d1044f3f707715ba9fdeee0ee9f8d4cdb4] [formerly c97efbf656 [formerly 520dd57f02]]] Former-commit-id: bd3cda21062207e12d08d0b319ce56183936d10b [formerly 8eb1848d92c6225ecf7e4aff08b65f9f7fc71abe] [formerly 94e0faa6c6 [formerly 910464ea6a]] Former-commit-id: 94e0faa6c6 Former-commit-id: 0bcf000a31		2013-11-07 14:25:45 -06:00
..
.project	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
build.properties	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
com.raytheon.viz.text.feature.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00
feature.xml	Merge branch 'omaha_13.5.3' (13.5.3-5) into development	2013-11-07 14:25:45 -06:00