Steve Harris 716879f58b Merge tag 'OB_14.4.1-4m' into omaha_15.1.1 ... Conflicts: cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/roles/DataProviderEventController.java edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/reportalarm/AlertalarmRecord.java Former-commit-id: 714ca199f27013313099920bb9f55009c794f7f8		2015-01-27 11:56:24 -06:00
..
icons	Issue #3076 added clear all to shared display sessions	2014-05-06 09:30:07 -05:00
localization/collaboration	12.11.1-4 baseline	2012-10-16 13:27:07 -05:00
META-INF	Omaha #3356 remove OBE register buddies from collaboration	2014-09-03 10:00:11 -05:00
src/com/raytheon/uf/viz/collaboration/ui	Merge tag 'OB_14.4.1-4m' into omaha_15.1.1	2015-01-27 11:56:24 -06:00
.classpath	12.11.1-4 baseline	2012-10-16 13:27:07 -05:00
.project	12.11.1-4 baseline	2012-10-16 13:27:07 -05:00
build.properties	12.11.1-4 baseline	2012-10-16 13:27:07 -05:00
com.raytheon.uf.viz.collaboration.ui.ecl	13.1.2-6 baseline	2013-01-06 14:55:11 -06:00
plugin.xml	Omaha #3281 made venue session views non-sticky (except for feed view)	2014-06-27 15:33:11 -05:00