Mirror of Unidata's AWIPS2.
Find a file
Richard Peter f186912fe1 Merge branch 'omaha_13.4.1' (13.4.1-9) into development
Conflicts:
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/legal/FOSS_licenses/werkzeug/LICENSE.txt

Change-Id: Icc296cedd6d190d1743727c228e540036f9b6d8c

Former-commit-id: d37ba352e2 [formerly 648a1b25ae] [formerly a33ddbd1a6] [formerly a9869f07ba [formerly a33ddbd1a6 [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]]
Former-commit-id: a9869f07ba
Former-commit-id: fc1253a3eff64276ef10f0a5d0b23f403a4cff70 [formerly c47eb36e43]
Former-commit-id: aff520d61b
2013-05-17 10:33:18 -05:00
cave Merge branch 'omaha_13.4.1' (13.4.1-9) into development 2013-05-17 10:33:18 -05:00
cots Issue #1989 remove dead files 2013-05-16 10:25:38 -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-9) into development 2013-05-17 10:33:18 -05:00
edexOsgi Merge branch 'omaha_13.4.1' (13.4.1-9) into development 2013-05-17 10:33:18 -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 Issue #1987 - updates to support Eclipse 3.8 Windows 32-bit builds 2013-05-16 11:01:40 -05:00
nativeLib Issue #1952 - first modification; removed libraries and updated set_hydro_env 2013-05-08 13:41:08 -05:00
ncep Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages 2013-05-14 16:16:13 -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 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-9) into development 2013-05-17 10:33:18 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #2000 Fix broken stuff after Spring 3 upgrade 2013-05-15 16:54:40 -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