Steve Harris 25bd3ee930 Merge tag 'OB_14.4.1-20m' into omaha_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 (moved to build/deploy.edex.awips2/esb/conf/logback.xml; also removed edexOsgi/build.edex/esb/conf) rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template Former-commit-id: 0db97a3cefc6f709d336883202e51f1d5255ad75		2015-03-26 09:57:17 -05: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 omaha_15.1.1	2015-03-26 09:57:17 -05: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