Mirror of Unidata's AWIPS2.
Find a file
Richard Peter 7969ef9648 Merge branch 'development_on_RHEL5' (GOES-R) into development
Conflicts:
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatBlendedResource.java
	nativeLib/edexBridge/edexBridge.cpp
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: e82e1137f9 [formerly f5f75ec629 [formerly 039d9ecb587338801cdab9cad11b06890517d6a4]]
Former-commit-id: f5f75ec629
Former-commit-id: 760f215e8c
2013-12-03 16:25:31 -06:00
cave Merge branch 'development_on_RHEL5' (GOES-R) into development 2013-12-03 16:25:31 -06:00
cots Issue #2214 - restoring the libjep.so files I clobbered in the omaha_14.1.1 -> development merge 2013-11-19 10:08:45 -06:00
cotsSource/org.apache.qpid 13.5.1-7 baseline 2013-07-18 12:07:22 -04:00
deltaScripts Issue #2582 Fix decoding where OBS DTG are on separate lines, cleanup 2013-12-02 16:10:26 -06:00
edexOsgi Merge branch 'development_on_RHEL5' (GOES-R) into development 2013-12-03 16:25:31 -06:00
javaUtilities Issue #2359 add ability to ignore messages based on threads, ie ignore 2013-11-22 15:54:22 -06: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 Issue #2422 - Fix edexBridge like in RHEL6 2013-12-02 15:16:42 -06:00
ncep Issue #2393 removed pypies interpolation 2013-11-20 08:40:12 -06:00
ost 14.1.1-7 baseline 2013-11-06 14:16:14 -05:00
pythonPackages Issue #2537 Serialize empty enum sets. 2013-12-03 12:17:01 -06:00
RadarServer Merge branch 'development' into development_on_RHEL6 2013-11-12 11:11:36 -06:00
rpms Merge branch 'development_on_RHEL5' (GOES-R) into development 2013-12-03 16:25:31 -06:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #2528 Allow geostationary data to display on an identical projection. 2013-11-26 17:38: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