Steve Harris fca46f9f01 Merge branch 'omaha_14.3.1' into omaha_14.4.1 ... Conflicts (these go to ufcore): cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/AbstractGraphicsTarget.java cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/cmenu/ChangePointStyleAction.java Former-commit-id: 3e2eeedc29 [formerly 9de49b59ea] [formerly cc7e6bc52a] [formerly 3e2eeedc29 [formerly 9de49b59ea] [formerly cc7e6bc52a] [formerly 676948e239 [formerly cc7e6bc52a [formerly da50f581c90ea0cca5f43c45c44cb8ac045a6c8c]]]] Former-commit-id: 676948e239 Former-commit-id: 27d4a11026 [formerly 586f563839] [formerly 1a57d0d34838b0e6e0a1f655b3563f62c2132b16 [formerly 18b2a1df08]] Former-commit-id: dc55036e5f98fad484f6203ac50fcba1e2ad81f9 [formerly 545d6da097] Former-commit-id: a6d5652425		2014-06-18 08:52:25 -05:00
..
.settings	12.11.1-4 baseline	2012-10-16 13:27:07 -05:00
META-INF	Issue #2903 made xmpp reconnect an explicit action by user	2014-04-15 15:12:33 -05:00
schema	Issue #2491 Fix collaboration Xml.	2013-10-31 14:06:37 -05:00
src/com/raytheon/uf/viz/collaboration/comm	Merge branch 'omaha_14.3.1' into omaha_14.4.1	2014-06-18 08:52:25 -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	Issue #2491 Fix collaboration Xml.	2013-10-31 14:06:37 -05:00
com.raytheon.uf.viz.collaboration.comm.ecl	13.1.2-6 baseline	2013-01-06 14:55:11 -06:00
plugin.xml	Issue #2491 Fix collaboration Xml.	2013-10-31 14:06:37 -05:00