awips2/cave/com.raytheon.uf.viz.d2d.nsharp
Ana Rivera ef35771bfa Merge branch 'omaha_14.4.1' into field_14.4.1. Conflicts resolved: VLab Issue #4129, #5421, #5345.
Conflicts:
	cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java
	cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Change-Id: Ic838b8b0499b1022a555915c7264b414d6948895

Former-commit-id: 214be0a93b [formerly 043bc3a8b7] [formerly 1823ed3596 [formerly 111ae763e6becb944e34e262e1d87d2d344236e4]]
Former-commit-id: 1823ed3596
Former-commit-id: d2d8127363
2014-12-16 23:39:02 +00:00
..
localization Omaha #3768 Pluginize the D2D Upper Air menu 2014-10-30 19:15:52 -05:00
META-INF Merge branch 'omaha_14.4.1' into field_14.4.1. Conflicts resolved: VLab Issue #4129, #5421, #5345. 2014-12-16 23:39:02 +00:00
src/com/raytheon/uf/viz/d2d/nsharp Merge branch 'omaha_14.4.1' into field_14.4.1. Conflicts resolved: VLab Issue #4129, #5421, #5345. 2014-12-16 23:39:02 +00: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 Issue #2033 moved bundles and menu files into corresponding plugins 2013-08-14 09:20:28 -05:00
com.raytheon.uf.viz.d2d.nsharp.ecl 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
plugin.xml Issue #2312 Add ability to export gif and image export dialog. 2014-01-21 18:09:13 -06:00