awips2/rpms/legal/FOSS_licenses/qpid
Steve Harris 78f0921f63 Merge branch 'omaha_13.4.1' into development
Conflicts:
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/datacatalog/PointDataCatalog.java

Former-commit-id: a150d8b90b [formerly 64cf1aedb1] [formerly 571757b2a6] [formerly 2327205cb7 [formerly 571757b2a6 [formerly 43499d1a76f65804a5e74894cad3186765de3501]]]
Former-commit-id: 2327205cb7
Former-commit-id: bfd7bfea914d41fc958828fa95730a334190b2e1 [formerly 035d74b348]
Former-commit-id: 8b78f538d3
2013-06-06 15:46:23 -05:00
..
cpp 13.4.1-9 baseline 2013-05-16 11:12:07 -04:00
dotnet 13.4.1-9 baseline 2013-05-16 11:12:07 -04:00
gentools/lib Merge branch 'omaha_13.4.1' (13.4.1-9) into development 2013-05-17 10:33:18 -05:00
java/resources 13.4.1-9 baseline 2013-05-16 11:12:07 -04:00
python 13.4.1-9 baseline 2013-05-16 11:12:07 -04:00
ruby 13.4.1-9 baseline 2013-05-16 11:12:07 -04:00
specs Issue - Licensing for java jdk, jbzip2, postgresql, qpid 2013-06-04 13:56:51 -05:00