From: Francois Chouinard <fchouinard@gmail.com>
Date: Wed, 22 Feb 2012 14:44:41 +0000 (-0500)
Subject: Merge branch 'master' into LTTng-TmfEventModel
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=4b8c992a9f9a408ebb7c219af99b47ee9af941a8;p=deliverable%2Ftracecompass.git

Merge branch 'master' into LTTng-TmfEventModel
---

4b8c992a9f9a408ebb7c219af99b47ee9af941a8
diff --cc org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/experiment/StateExperimentManager.java
index 85f3e6ed12,67adce28a0..0bf5bf883d
--- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/experiment/StateExperimentManager.java
+++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/experiment/StateExperimentManager.java
@@@ -549,4 -549,4 +549,4 @@@ public class StateExperimentManager ext
              return stateTraceModel;
          }
      }
--}
++}
diff --cc org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java
index 48be6c3079,c4f71f173e..0493528262
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java
@@@ -390,4 -392,4 +393,4 @@@ public class TimeFrameView extends TmfV
          }
      }
  
--}
++}