Steve Harris bc84d97750 Merge branch 'omaha_16.1.1' into omaha_16.2.1 ... Conflicts: cave/com.raytheon.uf.viz.product.alertviz/src/com/raytheon/uf/viz/product/alertviz/AlertVizApplication.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/FormatterScriptFactory.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFED2DDao.java Former-commit-id: 3ba87373d75582c47288fe39e8f72aa404de0a94		2015-09-22 15:57:39 -05:00
..
alertviz	Omaha #4295 Defined the Linux Cave product file since it does not use build.xml	2015-07-01 10:32:09 -05:00
cave	Merge remote-tracking branch 'origin/master_16.1.1' into asm_16.1.1	2015-07-30 20:53:19 +00:00
eclipse	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
lib/ant	Omaha #3299 - Add back correct jars, update deploy-install to search for plugins in optionaldirectories	2015-02-26 14:03:17 -06:00
static	Merge branch 'omaha_16.1.1' into omaha_16.2.1	2015-09-22 15:57:39 -05: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	Issue #2885 Updated java version in build.properties.p2.	2014-03-06 17:35:43 -06:00
build.sh	Omaha #4295 Defined the Linux Cave product file since it does not use build.xml	2015-07-01 10:32:09 -05:00
build.xml	Omaha #4295 Removed AlertViz and the use of bat files on Windows.	2015-06-30 13:19:23 -05:00
p2-build-strict.xml	Issue #2262 Delete meteolib.	2013-08-28 14:53:46 -05:00
p2-build.xml	Omaha #4696 Moved everything to grid.netcdf plugin. NOS is all configs. Rename viz.grib.feature to uf.viz.grid.feature.	2015-09-17 14:47:30 -04:00