Fay.Liang 3bd4d76143 Merge tag 'OB_14.4.1-20m' into master_15.1.1 ... 14.4.1-20m Conflicts: cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java edexOsgi/build.edex/esb/conf/logback.xml edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template Former-commit-id: 1d282a64da2998d91040a7c97f2e81beea0a8da4		2015-03-30 14:28:30 -04: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-20m' into master_15.1.1	2015-03-30 14:28:30 -04: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