Mirror of Unidata's AWIPS2.
Find a file
Richard Peter ecba2f7317 Merge branch 'development' into development_on_RHEL6
Conflicts:
	edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar
	edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	rpms/awips2.cave/Installer.cave-feature/component.spec

Former-commit-id: 1a664aed21 [formerly fee86c220c12c09c714245fa8666bc08f4f9775b]
Former-commit-id: c0643db0ba
2013-10-09 13:14:06 -05:00
cave Merge branch 'omaha_13.5.3' (13.5.2-8) into development 2013-10-08 10:59:50 -05:00
cots Issue #2422 - Merge branch 'omaha_14.1.1' into development_on_RHEL6 2013-09-30 18:00:31 -05:00
cotsSource/org.apache.qpid 13.5.1-7 baseline 2013-07-18 12:07:22 -04:00
deltaScripts Issue #2333 Refactored satellite to store table values in CRS space instead of lat/lon for GOES-R readiness 2013-10-03 11:43:26 -05:00
edexOsgi Merge branch 'development' into development_on_RHEL6 2013-10-09 13:14:06 -05:00
javaUtilities Merge branch 'master_14.1.1' into omaha_14.1.1 2013-10-08 10:35: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 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-07-23 13:57:38 -05:00
msi Issue #2033 - windows build updates for etc directory deployment 2013-10-07 18:41:49 -05:00
nativeLib Merge branch 'omaha_14.1.1' into development_on_RHEL6 2013-10-08 14:44:38 -05:00
ncep Merge branch 'omaha_14.1.1' into development_on_RHEL6 2013-10-08 14:44:38 -05:00
ost Issue #2333 Refactored satellite to store table values in CRS space instead of lat/lon for GOES-R readiness 2013-10-03 11:43:26 -05:00
pythonPackages Merge branch 'omaha_13.5.3' (13.5.2-7) into development 2013-10-01 15:06:34 -05:00
RadarServer Merge branch 'omaha_13.5.1' (13.5.1-8) into development 2013-07-31 12:54:12 -05:00
rpms Merge branch 'development' into development_on_RHEL6 2013-10-09 13:14:06 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #1797 Fix p2 build for tests, removed ISerializable deprecrated calls form reg objects 2013-10-08 10:25:36 -05: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