Mirror of Unidata's AWIPS2.
Find a file
Richard Peter dd2ceed4ae Merge branch 'omaha_13.4.1' (13.4.1-7) into development
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/VRShearLayer.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/interrogators/RadarVelocityInterrogator.java
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Change-Id: Ie7062275be13d6b19bbc9476b0c0f5aba129c862

Former-commit-id: 207c17d5af [formerly 2c009eb618] [formerly a12830f762] [formerly 207c17d5af [formerly 2c009eb618] [formerly a12830f762] [formerly c5040038d3 [formerly a12830f762 [formerly 3f82f4d18bd7d0afa1e4cb49493e690d9160c24e]]]]
Former-commit-id: c5040038d3
Former-commit-id: 994357c357 [formerly 6c09ab9bdf] [formerly 4a7cd13915319fef7cf3e6405d041ffee0348571 [formerly bcf4dcc810]]
Former-commit-id: 10a9ca07796d13205616f7696c5af614917400a1 [formerly f7470fbd8f]
Former-commit-id: c7755a649b
2013-05-13 17:11:05 -05:00
cave Merge branch 'omaha_13.4.1' (13.4.1-7) into development 2013-05-13 17:11:05 -05:00
cots Issue #1977 Merge branch 'omaha_13.4.1' into development 2013-05-06 15:04:23 -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 Merge branch 'omaha_13.4.1' (13.4.1-7) into development 2013-05-13 17:11:05 -05:00
edexOsgi Merge branch 'omaha_13.4.1' (13.4.1-7) into development 2013-05-13 17:11:05 -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 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 13.4.1-4 baseline 2013-05-02 10:00:38 -05:00
nativeLib Issue #1952 - first modification; removed libraries and updated set_hydro_env 2013-05-08 13:41:08 -05:00
ncep Merge branch 'omaha_13.4.1' (13.4.1-7) into development 2013-05-13 17:11:05 -05:00
ost 12.12.1-1 baseline 2012-11-07 12:41:20 -06:00
pythonPackages Issue #1638 Made pypies slab reads work in more than 2-d data. Moved DecisionTree to common.dataquery. Merged changes into CAVEApplication. 2013-05-08 17:58:19 -05:00
RadarServer 13.4.1-4.1 baseline (recovered lost bin directories for 13.4.1-4) 2013-05-03 09:20:30 -05:00
rpms Merge branch 'omaha_13.4.1' (13.4.1-7) into development 2013-05-13 17:11:05 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #1977 Merge branch 'omaha_13.4.1' into development 2013-05-06 15:04:23 -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