projects / deliverable / tracecompass.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 31a6a4e)
Merge branch 'master' into lttng_2_0_control_dev
authorBernd Hufmann <bhufmann@gmail.com>
Thu, 15 Mar 2012 14:57:57 +0000 (10:57 -0400)
committerBernd Hufmann <bhufmann@gmail.com>
Thu, 15 Mar 2012 14:57:57 +0000 (10:57 -0400)
Conflicts:
lttng/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF
lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/LTTngUiPlugin.java
lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java
lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/ControlView.java


No differences found
Tracecompass - Deliverables
This page took 0.024263 seconds and 5 git commands to generate.