David Friedman f146c7bcd0 Merge branch 'master_14.2.2' into asm_14.2.2 ... Remove unintentional changes from cd136c3. Fix problem in warning-request.xml from 3c9c34c. Conflicts: cave/build/static/linux/cave/cave.sh cave/build/static/linux/cave/caveUtil.sh cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d Former-commit-id: cf35c1870fc4b6b3c2ceaf038274c4701f8046b1		2014-03-27 19:17:03 +00:00
..
manualIngest-common.xml	13.5.1-4 baseline	2013-06-28 09:46:25 -04:00
manualIngest-request.xml	Issue #2515 upgraded camel from 2.11.0 to 2.11.2	2013-11-07 16:56:25 -06:00
manualIngest-spring.xml	Merge branch 'master_14.2.2' into asm_14.2.2	2014-03-27 19:17:03 +00:00