Mirror of Unidata's AWIPS2.
Find a file
Steve Harris 6d9efac6ef Merge branch 'omaha_14.1.1' (14.1.1-9) into development
Conflicts:
	cots/org.jep.linux32/libjep.so
	cots/org.jep.linux64/libjep.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
      (took all the omaha_14.1.1 versions)

Former-commit-id: 42b0235982d6d03e6e14057a1072842fcadc4b85
2013-11-15 13:15:25 -06:00
cave Merge branch 'omaha_14.1.1' (14.1.1-9) into development 2013-11-15 13:15:25 -06:00
cots Merge branch 'omaha_14.1.1' (14.1.1-9) into development 2013-11-15 13:15:25 -06:00
cotsSource/org.apache.qpid 13.5.1-7 baseline 2013-07-18 12:07:22 -04:00
deltaScripts Merge branch 'development' into development_on_RHEL6 2013-11-14 14:56:59 -06:00
edexOsgi Issue #2545 EdexBandwidthManager check for subsription event types before sending notifications. 2013-11-15 08:00:47 -06:00
javaUtilities Merge branch 'omaha_14.1.1' into development_on_RHEL6 2013-10-31 15:34:46 -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 Issue #2186 add generic pdo distributor and move the gfe routes to the gfe file; remove config.xml from warngen localization as it breaks things 2013-07-11 13:32:26 -05:00
MHSEmulator Issue #2009: Fix NullPointerException in SocketServer start up. 2013-08-14 17:13:58 -05:00
msi Issue #2423 - Windows Java 7 Updates. Note: AWIPSII.Environment is not an Eclipse plugin project 2013-10-09 13:26:27 -05:00
nativeLib Merge branch 'omaha_14.1.1' (14.1.1-9) into development 2013-11-15 13:15:25 -06:00
ncep Merge branch 'development' into development_on_RHEL6 2013-11-13 13:16:55 -06:00
ost 14.1.1-7 baseline 2013-11-06 14:16:14 -05:00
pythonPackages Merge branch 'omaha_13.5.3' (13.5.3-6) into development 2013-11-11 11:45:35 -06:00
RadarServer Merge branch 'development' into development_on_RHEL6 2013-11-12 11:11:36 -06:00
rpms Merge branch 'omaha_14.1.1' (14.1.1-9) into development 2013-11-15 13:15:25 -06:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #2546 added fix for TAFs that contain legacy valid times 2013-11-13 08:07:29 -06:00
tools 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
.gitignore Fix the git ignore file 2012-09-14 12:04:24 -05:00