Mirror of Unidata's AWIPS2.
Find a file
Steve Harris 211e5f8197 Merge branch 'omaha_14.3.1' (14.3.1-6) into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.level/utility/common_static/base/level/alias/gempak.xml

Former-commit-id: c678b56c81cb5ff798b5fcea75e00473c39fd53e
2014-05-23 08:16:43 -05:00
cave Merge "Omaha #3206 edex changes related to new javax.serlvet FOSS project" into omaha_14.4.1 2014-05-22 16:46:50 -05:00
cots Merge branch 'omaha_14.3.1' into omaha_14.4.1 - fixing geotools (goes in ufcore-foss) 2014-05-22 17:27:23 -05:00
deltaScripts Merge "Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP." into omaha_14.4.1 2014-05-19 16:07:51 -05:00
edexOsgi Merge branch 'omaha_14.3.1' (14.3.1-6) into omaha_14.4.1 2014-05-23 08:16:43 -05:00
javaUtilities Merge "Omaha #3093 add usage to hprof tool and standardize outputting size of things." into omaha_14.4.1 2014-05-22 18:11:19 -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' into omaha_14.4.1 2014-05-22 14:31:06 -05:00
ncep Merge branch 'omaha_14.3.1' (14.3.1-6) into omaha_14.4.1 2014-05-23 08:16:43 -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 #3133 remove org.apache.mina from radar server 2014-05-19 11:50:11 -05:00
rpms Omaha #3156 Removed geronimo servlet 2.5 jar from dependencies.txt and added it to rpms/awips2.qpid/0.18/SOURCES/awips2/. 2014-05-21 15:22:58 -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-6) into omaha_14.4.1 2014-05-23 08:16:43 -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