Mirror of Unidata's AWIPS2.
Find a file
Steve Harris 9213369739 Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Vector.py
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CCP.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GVV.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Former-commit-id: 48a7eabebb78db9b97201c44ff5c71af3ee78de7
2014-06-16 08:19:12 -05:00
cave Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1 2014-06-16 08:19:12 -05:00
deltaScripts Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1 2014-06-16 08:19:12 -05:00
edexOsgi Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1 2014-06-16 08:19:12 -05:00
javaUtilities Omaha #2840 log tool can now save html reports to directory 2014-06-11 17:13:38 -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-10,11) into omaha_14.4.1 2014-06-16 08:19:12 -05:00
ncep Omaha #2061 Remove IDecoderGettable from all AWIPS2 ncep PDOs. 2014-06-11 12:45:01 -05:00
ohd Omaha #3132 Fix ohd merge issues. 2014-06-02 13:40:26 -05:00
ost Omaha #3226 encryption support for total lightning 2014-06-10 08:46:41 -05:00
pythonPackages Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1 2014-06-16 08:19:12 -05:00
RadarServer Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1 2014-06-16 08:19:12 -05:00
rpms Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1 2014-06-16 08:19:12 -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