Merge branch 'master' into lttng-kepler

author Alexandre Montplaisir <alexmonthy@voxpopuli.im>

Fri, 3 Aug 2012 15:51:52 +0000 (11:51 -0400)

committer Alexandre Montplaisir <alexmonthy@voxpopuli.im>

Fri, 3 Aug 2012 15:51:52 +0000 (11:51 -0400)
author Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Fri, 3 Aug 2012 15:51:52 +0000 (11:51 -0400)
committer Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Fri, 3 Aug 2012 15:51:52 +0000 (11:51 -0400)
diff --cc org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF
Simple merge
diff --cc org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/HistoryBuilder.java
Simple merge
diff --cc org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF
Simple merge
author	Alexandre Montplaisir <alexmonthy@voxpopuli.im>
	Fri, 3 Aug 2012 15:51:52 +0000 (11:51 -0400)
committer	Alexandre Montplaisir <alexmonthy@voxpopuli.im>
	Fri, 3 Aug 2012 15:51:52 +0000 (11:51 -0400)
		1	2
org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF	patch \|	diff1 \|	diff2 \|	blob \| history
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/HistoryBuilder.java	patch \|	diff1 \|	diff2 \|	blob \| history
org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF	patch \|	diff1 \|	diff2 \|	blob \| history