projects / deliverable / tracecompass.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 93bfd50 75c271c)
Merge branch 'master' into lttng-kepler
authorPatrick Tasse <patrick.tasse@gmail.com>
Tue, 23 Oct 2012 14:47:15 +0000 (10:47 -0400)
committerPatrick Tasse <patrick.tasse@gmail.com>
Tue, 23 Oct 2012 14:47:15 +0000 (10:47 -0400)
commit15e89960c44f8b01fe8c8c7a68cdc5a91f62379c
tree515350d2377d7dc9171414ac7770370bbcfa03f5tree | snapshot
parent93bfd50a417e45402c56d420df8227dadee1fa74commit | diff
parent75c271cfc273cabf2b43428add4e971ebd016cd8commit | diff
Merge branch 'master' into lttng-kepler

Conflicts:
gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/gcov/Activator.java
lttng/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfTraceStub.java
lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java

Change-Id: Ifd5503a8abd3250f9c117f369de7fb9745507b8e
org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfTraceStub.java diff1 | diff2 | blob | history
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/trace/TmfExperimentContext.java diff1 | diff2 | blob | history
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java diff1 | diff2 | blob | history
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfExperiment.java diff1 | diff2 | blob | history
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java diff1 | diff2 | blob | history
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTrace.java diff1 | diff2 | blob | history
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java diff1 | diff2 | blob | history
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java diff1 | diff2 | blob | history
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/loader/TmfUml2SDSyncLoader.java diff1 | diff2 | blob | history
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphViewer.java diff1 | diff2 | blob | history
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/widgets/TimeGraphControl.java diff1 | diff2 | blob | history
Tracecompass - Deliverables
This page took 0.026433 seconds and 5 git commands to generate.