Richard Peter 5e5047cc4f Merge branch 'omaha_13.5.1' (13.5.1-15) into development ... Conflicts: cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java edexOsgi/com.raytheon.edex.plugin.bufrua/res/pointdata/bufruadb.xml edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.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.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java Former-commit-id: e1aa1aa51e2325b005604aa971e842bccfcd8375		2013-08-14 15:23:18 -05:00
..
bufrmapping	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
pointdata	Merge branch 'omaha_13.5.1' (13.5.1-15) into development	2013-08-14 15:23:18 -05:00
spring	Issue #1989 make camel stacktraces not get bunched up on a single line, consolidate log component settings to edex.xml	2013-06-19 10:16:06 -05:00