Mirror of Unidata's AWIPS2.
Find a file
Richard Peter 7966576f23 Merge branch 'omaha_13.4.1' (13.4.1-11) into development
Conflicts:
	ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java
	ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/RscBundleDisplayMngr.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageDisplay.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageResource.java
	ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/imageProperties/ImagingDialog.java
	ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.viz.ui.display/src/gov/noaa/nws/ncep/viz/ui/display/NCDisplayPane.java

Former-commit-id: 3d84e1dd53 [formerly 8aa4b0025c] [formerly 3d84e1dd53 [formerly 8aa4b0025c] [formerly 930ff50fb8 [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]]
Former-commit-id: 930ff50fb8
Former-commit-id: 76f11f00ae [formerly 81ae3ea8bf]
Former-commit-id: 046de916fd
2013-05-21 12:11:21 -05:00
cave Merge branch 'omaha_13.4.1' (13.4.1-11) into development 2013-05-21 12:11:21 -05:00
cots Issue #1989 remove dead files 2013-05-16 10:25:38 -05:00
cotsSource/org.apache.qpid Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
deltaScripts 13.4.1-11 baseline 2013-05-21 09:19:25 -04:00
edexOsgi Merge branch 'omaha_13.4.1' (13.4.1-11) into development 2013-05-21 12:11:21 -05:00
javaUtilities Issue #1995 - Wes2Bridge jar construction is now compatible with Eclipse 3.8. 2013-05-09 19:51:32 -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 #1663 - awips2-database will no longer install site-specific databases. 2013-04-04 13:03:08 -05:00
MHSEmulator 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
msi Issue #1987 - updates to support Eclipse 3.8 Windows 32-bit builds 2013-05-16 11:01:40 -05:00
nativeLib Issue #1952 - second modification that will not require re-compilation or upgrades of system libraries 2013-05-20 16:58:56 -05:00
ncep Merge branch 'omaha_13.4.1' (13.4.1-11) into development 2013-05-21 12:11:21 -05:00
ost 12.12.1-1 baseline 2012-11-07 12:41:20 -06:00
pythonPackages Merge branch 'omaha_13.4.1' (13.4.1-11) into development 2013-05-21 12:11:21 -05:00
RadarServer Issue #1927 - add quartz as a RadarServer build dependency 2013-05-15 12:38:02 -05:00
rpms Merge branch 'omaha_13.4.1' (13.4.1-11) into development 2013-05-21 12:11:21 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #2000 Subscription overlap configuration GUI 2013-05-20 17:12:47 -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