projects / deliverable / tracecompass.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: be48c4f a9cdbaf)
Merge commit '3a6b7eb9a532100a4cb85e0a81fbc8bd6e91db13' into lttng-luna
authorAlexandre Montplaisir <alexmonthy@voxpopuli.im>
Tue, 10 Sep 2013 20:15:51 +0000 (16:15 -0400)
committerAlexandre Montplaisir <alexmonthy@voxpopuli.im>
Tue, 10 Sep 2013 20:28:43 +0000 (16:28 -0400)
commite3254d3a4df56dc911967c8cb02a64a8b9ea8f0b
treedb00615bcbbebeee975a6f39e9cc09a8af56a7d0tree | snapshot
parentbe48c4ff9542b07c8e8d98c9f8a432a73b976131commit | diff
parenta9cdbafc829ad72a236f460215c2de1249504641commit | diff
Merge commit '3a6b7eb9a532100a4cb85e0a81fbc8bd6e91db13' into lttng-luna

These conflicts are a little intense, let's fix them one merge at a time...

Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Conflicts:
lttng/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF
lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfEventFactory.java
lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenExperimentHandler.java

Change-Id: If5589c465c299b4f2c718ae25426c5afe446fce1
org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF diff1 | diff2 | blob | history
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfEvent.java diff1 | diff2 | blob | history
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfEventFactory.java diff1 | diff2 | blob | history
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statistics/TmfEventsStatistics.java diff1 | diff2 | blob | history
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/Messages.java diff1 | diff2 | blob | history
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/SynchronizeTracesHandler.java diff1 | | blob | history
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/messages.properties diff1 | diff2 | blob | history
Tracecompass - Deliverables
This page took 0.028783 seconds and 5 git commands to generate.