Mirror of Unidata's AWIPS2.
Find a file
Greg Armendariz e1180e770a Merge branch 'omaha_15.1.1' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/DbInit.java

Former-commit-id: e5919e105b [formerly f12b1a1098] [formerly e5919e105b [formerly f12b1a1098] [formerly 8773e17083 [formerly 111178b736cc4e894f59bc7127ec2bddda96264c]]]
Former-commit-id: 8773e17083
Former-commit-id: 49bd932339 [formerly a6133db8d2]
Former-commit-id: ec12c703fe
2014-07-21 12:12:32 -05:00
cave Merge branch 'omaha_15.1.1' into omaha_14.4.1 2014-07-16 13:21:53 -05:00
deltaScripts Omaha #3300 moving 15.1.1 deltascript back into 14.4.1 2014-07-16 14:53:18 -05:00
edexOsgi Merge branch 'omaha_15.1.1' into omaha_14.4.1 2014-07-21 12:12:32 -05:00
javaUtilities Omaha #3275 - moving developer tools to separate repository 2014-06-25 16:16:03 -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
msi Issue #2851 - 64-bit Windows build updates; also supports 32-bit builds 2014-03-31 12:37:37 -05:00
nativeLib Omaha #3379 Removing DWR 2014-07-11 11:56:44 -05:00
ncep Omaha #2914 - Remove calls to PropertiesFactory 2014-07-17 15:41:38 -05:00
ohd Omaha #3165 fix bad manifests 2014-07-10 09:20:24 -05:00
ost Omaha #3226 fixed lightning decrypt validation, added initialization vector 2014-06-19 10:32:05 -05:00
pythonPackages Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response 2014-07-07 09:02:14 -05:00
RadarServer Omaha #3309 - Remove reference to slf4j-log4j library 2014-06-26 11:34:47 -05:00
rpms Omaha #3339 - created a method to build non-EDEX and non-CAVE RPMs contributed by Work Assignments. 2014-07-08 09:31:21 -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-12) into omaha_14.4.1 2014-07-01 15:34:39 -05:00
.gitignore Fix the git ignore file 2012-09-14 12:04:24 -05:00