Mirror of Unidata's AWIPS2.
Find a file
Steve Harris 165971a4f6 Merge tag 'OB_14.4.1-20m' into omaha_15.1.1
14.4.1-20m

 Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	edexOsgi/build.edex/esb/conf/logback.xml (moved to build/deploy.edex.awips2/esb/conf/logback.xml; also removed edexOsgi/build.edex/esb/conf)
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: 0db97a3cefc6f709d336883202e51f1d5255ad75
2015-03-26 09:57:17 -05:00
build Merge tag 'OB_14.4.1-20m' into omaha_15.1.1 2015-03-26 09:57:17 -05:00
cave Merge tag 'OB_14.4.1-20m' into omaha_15.1.1 2015-03-26 09:57:17 -05:00
crh ASM #17168 - Add directory/files needed to create new decoderpostprocessor rpm 2015-02-26 13:15:17 -05:00
deltaScripts Merge tag 'OB_14.4.1-20m' into omaha_15.1.1 2015-03-26 09:57:17 -05:00
edexOsgi Merge tag 'OB_14.4.1-20m' into omaha_15.1.1 2015-03-26 09:57:17 -05:00
javaUtilities Omaha #3299 - Updated deploy-install to find features 2015-02-25 09:51:49 -06: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 tag 'OB_14.4.1-18m' into omaha_15.1.1 2015-03-18 09:29:01 -05: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 omaha_15.1.1 2015-03-26 09:57:17 -05:00
RadarServer Merge tag 'OB_14.3.2-19m' into master_14.4.1 2015-03-09 16:11:13 -04:00
rpms Merge tag 'OB_14.4.1-20m' into omaha_15.1.1 2015-03-26 09:57:17 -05: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