Mirror of Unidata's AWIPS2.

Ana Rivera edb9a9bf86 Merge branch 'master_14.4.1'(OB_14.4.1-36) into field_15.1.1 ... Conflicts: cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template Change-Id: I33c3dd2cc2b8be8a8ca9370839f07512b12d8e6d Former-commit-id: 8608cf4250be497aa20d13088a20bece02befd92		2015-05-11 20:21:13 +00:00
build	Merge branch 'master_14.4.1'(OB_14.4.1-36) into field_15.1.1	2015-05-11 20:21:13 +00:00
cave	Merge branch 'master_14.4.1'(OB_14.4.1-36) into field_15.1.1	2015-05-11 20:21:13 +00:00
crh	ASM #17168 - Add directory/files needed to create new decoderpostprocessor rpm	2015-02-26 13:15:17 -05:00
deltaScripts	Merge branch 'master_14.4.1'(OB_14.4.1-36) into field_15.1.1	2015-05-11 20:21:13 +00:00
edexOsgi	Merge branch 'master_14.4.1'(OB_14.4.1-36) into field_15.1.1	2015-05-11 20:21:13 +00:00
javaUtilities	Omaha #4392 Fixed broker address substitution	2015-04-22 12:04:54 -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
nativeLib	Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1	2015-04-08 12:22:27 -04:00
ost	Merge tag 'OB_14.3.1-19m' into omaha_14.4.1	2014-09-23 11:41:10 -05:00
pythonPackages	Merge tag 'OB_14.4.1-20m' into master_15.1.1	2015-03-30 14:28:30 -04:00
RadarServer	Merge tag 'OB_14.4.1-20m' into master_15.1.1	2015-03-30 14:28:30 -04:00
rpms	Merge branch 'master_14.4.1'(OB_14.4.1-36) into field_15.1.1	2015-05-11 20:21:13 +00: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