Mirror of Unidata's AWIPS2.
Find a file
Steve Harris f555652cd9 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: ab770c03d7 [formerly 42123642eb] [formerly 27b08f8bcd] [formerly 27b08f8bcd [formerly 0cb8d202f5]] [formerly 4df5ae5a60 [formerly 27b08f8bcd [formerly 0cb8d202f5] [formerly 4df5ae5a60 [formerly f352b47e1d930bfe2bc46f956c781375881e41f9]]]]
Former-commit-id: 4df5ae5a60
Former-commit-id: 54f4e95810b35bf4a0f392b39180bc241f36ef5a [formerly 64e15ba68857c2ece6d688b1556814e69b181e79] [formerly bf236d5aa1 [formerly 51d4907b76]]
Former-commit-id: bf236d5aa1
Former-commit-id: 0e390da822
2014-07-14 11:54:53 -05:00
cave Merge "Omaha #3371 all subprocesses now killed when cave.sh is killed" into omaha_14.4.1 2014-07-14 11:15:01 -05:00
deltaScripts Omaha #3318 Delta script for GEFS h5 file updates 2014-07-10 16:30:03 -05:00
edexOsgi Merge branch 'omaha_14.3.1' into omaha_14.4.1 2014-07-14 11:54:53 -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 #3165 remove deprecated buildColorMap() 2014-06-30 13:22:57 -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 #3096 fix DataTime to match the Python version 2014-06-26 15:12:39 -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