xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/rpms/awips2.qpid/0.18
History
Richard Peter 648a1b25ae 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: a9869f07ba [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]
Former-commit-id: a33ddbd1a6
2013-05-17 10:33:18 -05:00
..
deploy.builder 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
SOURCES Issue #2006 - qpid is now compatible with the upgraded FOSS libraries. 2013-05-16 11:00:47 -05:00
SPECS Issue #2006 - qpid is now compatible with the upgraded FOSS libraries. 2013-05-16 11:00:47 -05:00