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
..
.settings	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
META-INF	Issue #2142 Got log4j out of edex.	2013-07-15 14:26:15 -05:00
res/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
src/com/raytheon/uf/edex/plugin/acarssounding	Merge branch 'master_14.2.2' into asm_14.2.2	2014-03-27 19:17:03 +00:00
utility/common_static/base/purge	12.12.1-1 baseline	2012-11-07 12:41:20 -06: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	12.9.1-5 baseline	2012-08-21 15:27:03 -05:00
com.raytheon.uf.edex.plugin.acarssounding.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00