Mirror of Unidata's AWIPS2.
Find a file
Ana Rivera 40df82b005 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 214be0a93b [formerly 043bc3a8b7] [formerly 1823ed3596 [formerly 111ae763e6becb944e34e262e1d87d2d344236e4]]]
Former-commit-id: 1823ed3596
Former-commit-id: ef35771bfa [formerly d2d8127363]
Former-commit-id: f7c0319ee4
2014-12-16 23:39:02 +00:00
build Omaha #3836 - initial commit of the groovy-based developer deployment. 2014-12-04 16:17:53 -06:00
cave 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
CIMSS VLab Issue #5345 - Ingest, Load, Display severe probability for a storm cell 2014-12-14 15:40:19 -06:00
crh/gov.noaa.nws.crh.edex.grib.decoderpostprocessor VLab Issue #4848 - Initial commit of CRH NAM Nest GRIB post-processor; fixes #4848 2014-11-14 12:11:12 -06:00
deltaScripts Omaha #3788 Switch satellite_spatial.gid to a sequence. 2014-11-07 10:23:39 -06:00
edexOsgi 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
javaUtilities Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm. 2014-12-05 09:20:23 -06:00
localApps 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localization Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP. 2014-05-09 09:34:49 -05:00
msi Issue #2851 - 64-bit Windows build updates; also supports 32-bit builds 2014-03-31 12:37:37 -05:00
nativeLib Omaha #2991 Initial commit of QPID 0.28 and 0.30. Update native code to work with 0.30. 2014-11-10 08:27:28 -06:00
ncep Omaha #3549 remove jdt prefs for faster builds 2014-12-03 18:00:03 -06:00
ost Merge tag 'OB_14.3.1-19m' into omaha_14.4.1 2014-09-23 11:41:10 -05:00
pythonPackages Omaha #3216 - Update Python to 2.7.8, move specific site-packages to AWIPS2_build 2014-11-18 13:48:19 -06:00
RadarServer VLab Issue #5020 - DCS_16776 Ingest and display MBA; fixes #5020 2014-11-21 15:42:48 +00:00
rpms 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
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Omaha #3365 Realign AWIPS2_baseline tests 2014-09-30 12:53:20 -05:00
.gitignore Omaha #3685 Add support for sending specific products in mixed case 2014-10-22 14:29:30 -05:00