David Friedman 1168a3eae5 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: 32a7adbe4b [formerly fd900e38c2] [formerly f146c7bcd0 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]] Former-commit-id: f146c7bcd0 Former-commit-id: 533d15c863		2014-03-27 19:17:03 +00:00
..
alertviz	14.1.1-3 baseline	2013-10-28 10:46:02 -04:00
cave	Issue #2779 update memory settings for renamed NC perspective	2014-03-11 10:28:01 -05:00
eclipse	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
lib/ant	13.5.1-1 baseline	2013-06-10 15:17:17 -04:00
static	Merge branch 'master_14.2.2' into asm_14.2.2	2014-03-27 19:17:03 +00:00
tools	Moving 12.1.1 into ss_sync	2012-01-19 11:53:12 -06:00
.project	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
.pydevproject	13.4.1-3 baseline	2013-04-29 12:25:07 -05:00
build.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00
build.properties.p2	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
build.sh	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
build.xml	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
p2-build-strict.xml	Issue #2262 Delete meteolib.	2013-08-28 14:53:46 -05:00
p2-build.xml	14.1.1-3 baseline	2013-10-28 10:46:02 -04:00