David Friedman 8230919596 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: b3492e55de [formerly ee37afaf7b] [formerly 32a7adbe4b] [formerly 32a7adbe4b [formerly fd900e38c2]] [formerly b3492e55de [formerly ee37afaf7b] [formerly 32a7adbe4b] [formerly 32a7adbe4b [formerly fd900e38c2]] [formerly f146c7bcd0 [formerly 32a7adbe4b [formerly fd900e38c2] [formerly f146c7bcd0 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]]] Former-commit-id: f146c7bcd0 Former-commit-id: b0bec4816d [formerly 1e4ac84f99] [formerly 1168a3eae5] [formerly 292af91e33e58076664a7b293339b7ad623ff349 [formerly 06e6f2e7e7ae2f1959eaefcb5e76c2a04c33de99] [formerly 1168a3eae5 [formerly 533d15c863]]] Former-commit-id: 241abf743c90e94431e5559e7fcdeb450730b8fb [formerly beb961d5304e2c2df6afc0538bae8011c8b6f63f] [formerly 8f8f55dd3c [formerly dde12b4fc3]] Former-commit-id: 8f8f55dd3c Former-commit-id: 8ea6e0b064		2014-03-27 19:17:03 +00:00
..
Apps_defaults	Merge branch 'master_14.2.2' into asm_14.2.2	2014-03-27 19:17:03 +00:00