Merge branch 'master' into TmfTraceModel-new
authorFrancois Chouinard <fchouinard@gmail.com>
Tue, 17 Apr 2012 17:12:11 +0000 (13:12 -0400)
committerFrancois Chouinard <fchouinard@gmail.com>
Tue, 17 Apr 2012 17:12:11 +0000 (13:12 -0400)
commitbcbea6a67317680eee176e09811cd0feb0e8c20f
treeed9e76e097e1a7bf0498f88dd4d8ce739ee28841
parentce2388e0117a0d5a1bc3392fe90e45a50e8e9a34
parentafe13e7af5312218f2b8130515e48a3667df5a98
Merge branch 'master' into TmfTraceModel-new

Conflicts:
lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfIterator.java
lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java
lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentContext.java
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfIterator.java
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentContext.java
This page took 0.030575 seconds and 5 git commands to generate.