From: Bernd Hufmann <bhufmann@gmail.com>
Date: Thu, 8 Mar 2012 20:21:51 +0000 (-0500)
Subject: Merge branch 'master' into lttng_2_0_control_dev
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ec03c8d6e46ec4059fc9e04ca0bf10981727efa6;p=deliverable%2Ftracecompass.git

Merge branch 'master' into lttng_2_0_control_dev

Conflicts:
	lttng/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/AllLTTngUITests.java
---

ec03c8d6e46ec4059fc9e04ca0bf10981727efa6
diff --cc org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/AllLTTngUITests.java
index 2eb9b64bed,87e6a9f557..e5f235ad0d
--- a/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/AllLTTngUITests.java
+++ b/org.eclipse.linuxtools.lttng.ui.tests/src/org/eclipse/linuxtools/lttng/ui/tests/AllLTTngUITests.java
@@@ -7,11 -7,7 +7,10 @@@ public class AllLTTngUITests  
      public static Test suite() {
          TestSuite suite = new TestSuite(AllLTTngUITests.class.getName());
          //$JUnit-BEGIN$
 +        suite.addTest(org.eclipse.linuxtools.lttng.ui.tests.control.model.impl.AllTests.suite());
 +        suite.addTest(org.eclipse.linuxtools.lttng.ui.tests.control.service.AllTests.suite());
          suite.addTest(org.eclipse.linuxtools.lttng.ui.tests.distribution.AllTests.suite());
-         suite.addTest(org.eclipse.linuxtools.lttng.ui.tests.histogram.AllTests.suite());
 +        suite.addTest(org.eclipse.linuxtools.lttng.ui.tests.control.model.component.AllTests.suite());
          //$JUnit-END$
          return suite;
      }
diff --cc org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java
index e549957dbf,8bff779fdc..2bd3fbe863
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java
@@@ -12,9 -12,7 +12,8 @@@
  
  package org.eclipse.linuxtools.lttng.ui.views;
  
 +import org.eclipse.linuxtools.lttng.ui.views.control.ControlView;
  import org.eclipse.linuxtools.lttng.ui.views.controlflow.ControlFlowView;
- import org.eclipse.linuxtools.lttng.ui.views.histogram.HistogramView;
  import org.eclipse.linuxtools.lttng.ui.views.resources.ResourcesView;
  import org.eclipse.linuxtools.lttng.ui.views.statistics.StatisticsView;
  import org.eclipse.linuxtools.tmf.ui.views.events.TmfEventsView;