Mirror of Unidata's AWIPS2.
Find a file
Steve Harris 038b284066 Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java

Former-commit-id: 03ba5101d6f277b55173f72c2a63869e9dc31c3f
2014-08-26 16:25:21 -05:00
cave Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1 2014-08-26 16:25:21 -05:00
deltaScripts Omaha #3049 - entire data directory cannot be removed because it is mounted 2014-08-13 16:59:26 -05:00
edexOsgi Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1 2014-08-26 16:25:21 -05:00
javaUtilities Omaha #3368 - Move ohd plugin to new repository 2014-08-21 11:04:08 -05: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 Merge branch 'omaha_14.3.1' into omaha_14.4.1 2014-08-04 22:20:29 -05:00
ncep Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1 2014-08-26 16:25:21 -05:00
ost Omaha #3226 fixed lightning decrypt validation, added initialization vector 2014-06-19 10:32:05 -05:00
pythonPackages Omaha #3393 Add request/response for RadarDataRecord. Remove broken RadarDao override. Convert a2_rad scripts. 2014-08-21 10:55:28 -04:00
RadarServer Omaha #3502 removed common.convert from rcm feature 2014-08-11 09:56:53 -05:00
rpms Merge "Omaha #3528 - removed unused versions of ldm from the baseline" into omaha_14.4.1 2014-08-21 18:10:00 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Omaha #3541 Updated A2 baseline to reflect request service split 2014-08-22 13:15:42 -05:00
.gitignore Fix the git ignore file 2012-09-14 12:04:24 -05:00