git.efficios.com Git - deliverable/tracecompass.git/commit

Merge branch 'master' into lttng-luna

Conflicts:
lttng/org.eclipse.linuxtools.ctf.parser/META-INF/MANIFEST.MF
lttng/org.eclipse.linuxtools.ctf.parser/pom.xml
lttng/org.eclipse.linuxtools.gdbtrace.core.tests/META-INF/MANIFEST.MF
lttng/org.eclipse.linuxtools.gdbtrace.core.tests/pom.xml
lttng/org.eclipse.linuxtools.gdbtrace.core/META-INF/MANIFEST.MF
lttng/org.eclipse.linuxtools.gdbtrace.core/pom.xml
lttng/org.eclipse.linuxtools.gdbtrace.help/META-INF/MANIFEST.MF
lttng/org.eclipse.linuxtools.gdbtrace.help/pom.xml
lttng/org.eclipse.linuxtools.gdbtrace.ui.tests/META-INF/MANIFEST.MF
lttng/org.eclipse.linuxtools.gdbtrace.ui.tests/pom.xml
lttng/org.eclipse.linuxtools.gdbtrace.ui/META-INF/MANIFEST.MF
lttng/org.eclipse.linuxtools.gdbtrace.ui/pom.xml
lttng/org.eclipse.linuxtools.gdbtrace/feature.xml
lttng/org.eclipse.linuxtools.gdbtrace/pom.xml
lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java

Change-Id: Iccbebfaa9e02141429f46e0bf7d973b1e6120779

author	Alexandre Montplaisir <alexmonthy@voxpopuli.im>
	Wed, 7 Aug 2013 19:45:05 +0000 (15:45 -0400)
committer	Alexandre Montplaisir <alexmonthy@voxpopuli.im>
	Wed, 7 Aug 2013 19:50:29 +0000 (15:50 -0400)
commit	54eaf6f7601be2d8b478a2e4626c94518da661a9
tree	15bafd31a96f5a9d2bf74a691ea8d708779ac35b	tree \| snapshot
parent	ff0960ac037b0ea461ac7827d9a9a483ecc9d05a	commit \| diff
parent	58d9bc36408fa8c8a29022afe325243b40d34088	commit \| diff

org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/StreamInputReader.java	diff1 \|	diff2 \|	blob \| history
org.eclipse.linuxtools.gdbtrace.core/pom.xml	diff1 \|	diff2 \|	blob \| history
org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.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.ui/src/org/eclipse/linuxtools/tmf/ui/views/timegraph/AbstractTimeGraphView.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/TimeGraphCombo.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
pom.xml	diff1 \|	diff2 \|	blob \| history