From: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Date: Tue, 13 Aug 2013 17:55:10 +0000 (-0400)
Subject: Merge branch 'master' into lttng-luna
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=58fd788eceb59fe82ae93bf1140810f9ca94c594;p=deliverable%2Ftracecompass.git

Merge branch 'master' into lttng-luna

Conflicts:
	lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java

Change-Id: I27e699fdbbe30dc669601ec8e25cce7fd37b83e4
---

58fd788eceb59fe82ae93bf1140810f9ca94c594
diff --cc org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timegraph/AbstractTimeGraphView.java
index 82a52ac65c,99b8d4c19a..321c40a967
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timegraph/AbstractTimeGraphView.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timegraph/AbstractTimeGraphView.java
@@@ -69,11 -73,10 +73,10 @@@ import org.eclipse.ui.IActionBars
  /**
   * An abstract view all time graph views can inherit
   *
-  * This view contains a time graph combo, divided between a treeview on the
-  * left, showing entries and a canvas on the right to draw something for these
-  * entries.
+  * This view contains either a time graph viewer, or a time graph combo which is
+  * divided between a tree viewer on the left and a time graph viewer on the right.
   *
 - * @since 2.1
 + * @since 3.0
   */
  public abstract class AbstractTimeGraphView extends TmfView {