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

diff --cc org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF
Simple merge

diff --cc org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTrace.java
Simple merge

diff --cc org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java
Simple merge

diff --cc org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/Messages.java
Simple merge

diff --cc org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timegraph/AbstractTimeGraphView.java
index 82a52ac65cdc930a911bc89a0417991094adcddd,99b8d4c19a7a6a263b7dfe0d1ce42ac8281e254a..321c40a967d49e92352c50a8529f0e1871501bee
--- 1/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timegraph/AbstractTimeGraphView.java
--- 2/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 {
  

diff --cc org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphCombo.java
Simple merge

diff --cc org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphViewer.java
Simple merge

diff --cc org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/widgets/TimeGraphControl.java
Simple merge

diff --cc org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/virtualtable/TmfVirtualTable.java
Simple merge