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

Merge branch 'master' into lttng-kepler

Conflicts:
lttng/org.eclipse.linuxtools.ctf.core.tests/pom.xml
lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/StreamInputPacketReader.java
lttng/org.eclipse.linuxtools.lttng.releng-site/pom.xml
lttng/org.eclipse.linuxtools.lttng/feature.xml
lttng/org.eclipse.linuxtools.lttng/pom.xml
lttng/org.eclipse.linuxtools.lttng2.kernel/feature.xml
lttng/org.eclipse.linuxtools.lttng2.kernel/pom.xml
lttng/org.eclipse.linuxtools.lttng2/feature.xml
lttng/org.eclipse.linuxtools.lttng2/pom.xml
lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfEvent.java
lttng/org.eclipse.linuxtools.tmf/feature.xml
lttng/org.eclipse.linuxtools.tmf/pom.xml

Change-Id: I5f85d26a7d5d4008cae9a5ed3ed6ebce7f1bd527

author	Alexandre Montplaisir <alexmonthy@voxpopuli.im>
	Mon, 19 Nov 2012 19:03:08 +0000 (14:03 -0500)
committer	Alexandre Montplaisir <alexmonthy@voxpopuli.im>
	Mon, 19 Nov 2012 19:10:56 +0000 (14:10 -0500)
commit	45cbd8dc8db7753379420a93602904f62771396e
tree	2de710c101250db800e08a1b2ff22b2b71a07707	tree \| snapshot
parent	13ccc36bc22844fbc752735bc3644472f20ef909	commit \| diff
parent	f3105f09ef87829d0e9408a71dcb7f840d173c96	commit \| diff

org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTrace.java	diff1 \|	diff2 \|	blob \| history
org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/StreamInputPacketReader.java	diff1 \|	diff2 \|	blob \| history
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfEvent.java	diff1 \|	diff2 \|	blob \| history