Mirror of Unidata's AWIPS2.
Find a file
Steve Harris 2b95865dec Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java
	edexOsgi/build.edex/edex/common.properties
	edexOsgi/build.edex/esb/conf/modes.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so

Former-commit-id: 455eb8b39d [formerly 7fec0d039c [formerly 45250149681f057cf168f4d3cb27276279f62c05]]
Former-commit-id: 7fec0d039c
Former-commit-id: 647cd97e29
2014-06-02 11:21:46 -05:00
cave Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1 2014-06-02 11:21:46 -05:00
deltaScripts Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1 2014-06-02 11:21:46 -05:00
edexOsgi Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1 2014-06-02 11:21:46 -05:00
javaUtilities Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1 2014-06-02 11:21:46 -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 Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP. 2014-05-09 09:34:49 -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.3.1' (14.3.1-8) into omaha_14.4.1 2014-06-02 11:21:46 -05:00
ncep Omaha #3179 split modes.xml into plugin modes files 2014-05-28 13:32:18 -05:00
ohd Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1 2014-06-02 11:21:46 -05:00
ost Omaha #2782: Update thread based logging 2014-05-08 09:06:31 -05:00
pythonPackages Merge branch 'master_14.2.2' into master_14.3.1 2014-04-25 11:06:11 -04:00
RadarServer Omaha #3152 modified rcm build to deploy logback instead of log4j 2014-05-28 12:17:39 -05:00
rpms Merge "Omaha #2536 merge autobldsrv into text plugins" into omaha_14.4.1 2014-05-29 13:51:09 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Merge branch 'omaha_14.3.1' (14.3.1-7) into omaha_14.4.1 2014-05-28 09:01:00 -05:00
tools Issue #2726: Edex graceful shutdown. 2014-04-14 13:10:11 -05:00
.gitignore Fix the git ignore file 2012-09-14 12:04:24 -05:00