Mirror of Unidata's AWIPS2.
Find a file
Ron Anderson d126af0f85 Merge branch 'omaha_16.1.1' into omaha_16.2.1
Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/FormatterlauncherAction.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowProductScriptsDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowPublishDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowSendIscGridsDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductAreaComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.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/FormatterUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenAction.java
	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
	edexOsgi/com.raytheon.uf.edex.plugin.loctables/src/com/raytheon/uf/edex/plugin/loctables/ingest/LocationTablesIngest.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Change-Id: Ie790e3a9a0c3829655a5a798a2c8b6740d02be6c

Former-commit-id: 691ca66a6f15c3cfae1bd1c8990644951d68a46f
2015-10-14 16:31:41 -05:00
build Omaha #3315 - fix checking amount of memory 2015-10-13 17:33:17 -05:00
cave Merge branch 'omaha_16.1.1' into omaha_16.2.1 2015-10-14 16:31:41 -05:00
crh Omaha #3756 Add configurable precipitation accumulation grib post processor. 2015-10-13 12:35:51 -04:00
deltaScripts Omaha #3756 Add configurable precipitation accumulation grib post processor. 2015-10-13 12:35:51 -04:00
edexOsgi Merge branch 'omaha_16.1.1' into omaha_16.2.1 2015-10-14 16:31:41 -05:00
javaUtilities Omaha #4759 - merge the new CAVE build into the viz rpm build. initial cleanup of the old build. 2015-10-09 18:17:34 -05:00
localApps 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localization Omaha #4722 WA20.45 FFMP MRMS QPE and QPF 2015-08-17 08:22:19 -05:00
nativeLib Merge remote-tracking branch 'origin/master_16.1.1' into asm_16.1.1 2015-07-30 20:53:19 +00:00
ost Omaha #4473 update references to moved logback classes 2015-06-09 10:41:23 -05:00
pythonPackages Omaha #4486 - Add python serialized FormattedDate 2015-09-21 13:36:00 -05:00
RadarServer ASM #17944 - RADAR: Radarserver should handle NDM file tdwrElevations.txt properly 2015-09-15 14:43:07 +00:00
rpms Merge branch 'omaha_16.1.1' into omaha_16.2.1 2015-10-14 16:31:41 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Merge branch 'ncep_14.2.2-n' into ncep_14.4.1 2014-12-16 13:06:21 -05:00
.gitignore Omaha #3685 Add support for sending specific products in mixed case 2014-10-22 14:29:30 -05:00