Mirror of Unidata's AWIPS2.
Find a file
Steve Harris 532d41787b Merge branch 'omaha_13.5.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/PointSubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java

Former-commit-id: df49d4d975e97a6b6c35e710dfd8244455eb21eb
2013-06-17 15:29:01 -05:00
cave Merge branch 'omaha_13.5.1' into development 2013-06-17 15:29:01 -05:00
cots Issue #1924 - standardize build.properties files 2013-06-13 16:04:18 -05:00
cotsSource/org.apache.qpid 13.4.1-4.1 baseline (recovered lost bin directories for 13.4.1-4) 2013-05-03 09:20:30 -05:00
deltaScripts 13.5.1-2 baseline 2013-06-17 15:01:22 -04:00
edexOsgi Merge branch 'omaha_13.5.1' into development 2013-06-17 15:29:01 -05:00
javaUtilities Issue #2021 - relocate all Java hydro projects from nativeLib to a sub-directory within javaUtilities 2013-06-03 11:05:21 -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 13.4.1-1 baseline 2013-04-24 17:15:55 -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 Merge branch 'master_13.5.1' into omaha_13.5.1 2013-06-17 15:25:32 -05:00
ncep 13.5.1-2 baseline 2013-06-17 15:01:22 -04:00
ost Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh 2013-05-29 14:49:43 -05:00
pythonPackages 13.5.1-2 baseline 2013-06-17 15:01:22 -04:00
RadarServer Issue #1927 - add quartz as a RadarServer build dependency 2013-05-15 12:38:02 -05:00
rpms Merge branch 'omaha_13.5.1' into development 2013-06-17 15:29:01 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Merge branch 'omaha_13.5.1' into development 2013-06-17 15:29:01 -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