David Friedman 8ea6e0b064 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: ee37afaf7b [formerly 32a7adbe4b] [formerly fd900e38c2] [formerly ee37afaf7b [formerly 32a7adbe4b] [formerly fd900e38c2] [formerly f146c7bcd0 [formerly fd900e38c2 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]] Former-commit-id: f146c7bcd0 Former-commit-id: 1e4ac84f99 [formerly 1168a3eae5] [formerly 06e6f2e7e7ae2f1959eaefcb5e76c2a04c33de99 [formerly 533d15c863]] Former-commit-id: beb961d5304e2c2df6afc0538bae8011c8b6f63f [formerly dde12b4fc3] Former-commit-id: 8f8f55dd3c		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	OB_14.1.1-19 baseline	2014-02-21 06:50:59 -05:00
src/com/raytheon/edex/textdb	ASM #330 - Fix reloading of TextDB static files	2014-03-18 13:12:40 +00:00
utility/common_static/base	Issue #2032 move build.edex's common-static files to appropriate plugins	2013-07-18 09:53:53 -05: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.edex.textdb.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00