Mirror of Unidata's AWIPS2.
Find a file
Richard Peter d65b11d404 Merge branch 'omaha_14.2.2' (14.2.2-3) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Former-commit-id: cd51f3fa87 [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: a7ec0bcf66
2014-04-11 16:23:09 -05:00
cave Merge branch 'omaha_14.2.2' (14.2.2-3) into development 2014-04-11 16:23:09 -05:00
cots Issue #2905 modified ucar BUFR library to fix bug 2014-04-10 16:43:10 -05:00
cotsSource/org.apache.qpid 13.5.1-7 baseline 2013-07-18 12:07:22 -04:00
deltaScripts Issue #2864 - Change how saved subset files are stored. 2014-04-11 08:27:42 -05:00
edexOsgi Merge branch 'omaha_14.2.2' (14.2.2-3) into development 2014-04-11 16:23:09 -05:00
javaUtilities Issue #2937 Consolidated LogEntry to string and from string conversions in utility 2014-04-09 18:47:09 -05:00
ldm 13.2.1-2 baseline 2013-01-23 11:18:44 -05:00
localApps 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localization Issue #2186 add generic pdo distributor and move the gfe routes to the gfe file; remove config.xml from warngen localization as it breaks things 2013-07-11 13:32:26 -05:00
MHSEmulator Issue #2758 Fix MHSEmulator to pass small files 2014-02-13 15:53:15 -06:00
msi Issue #2851 - 64-bit Windows build updates; also supports 32-bit builds 2014-03-31 12:37:37 -05:00
nativeLib Merge branch 'omaha_14.2.2' (14.2.1-14,15) into development 2014-03-26 16:19:26 -05:00
ncep Merge branch 'omaha_14.2.2' (14.2.2-3) into development 2014-04-11 16:23:09 -05:00
ost Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8) 2014-03-06 08:39:43 -06:00
pythonPackages Issue #2730 remove extracted numpy directories and files 2014-04-10 15:04:50 -05:00
RadarServer Merge branch 'omaha_14.2.2' (14.2.2-3) into development 2014-04-11 16:23:09 -05:00
rpms Issue #2886 Removed httpd-collaboration rpm Installation and added collab-dataserver 2014-04-03 17:47:58 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #2889 user who issued change now shows in notification center 2014-04-02 14:06:25 -05:00
tools 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
.gitignore Fix the git ignore file 2012-09-14 12:04:24 -05:00