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

Merge commit '2c789b58062b5bf3bb16ca1654ccf9cf87f3c444' into lttng-luna

Conflicts:
lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/EnumDefinition.java
lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/FloatDefinition.java
lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/IntegerDefinition.java
lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/StringDefinition.java
lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/StructDefinition.java

Change-Id: I1f0ffe6e8f8546aa1e0a6b850841558d57eb766b

author	Alexandre Montplaisir <alexmonthy@voxpopuli.im>
	Mon, 18 Nov 2013 22:14:16 +0000 (17:14 -0500)
committer	Alexandre Montplaisir <alexmonthy@voxpopuli.im>
	Mon, 18 Nov 2013 22:28:55 +0000 (17:28 -0500)
commit	9f3709a8051db3e2228ed29907e898deb15f825c
tree	167b2cf54aa39a729f3d29da92e6cf8aa38a5f35	tree \| snapshot
parent	11e4be4eba651db34843bf82fe94158b6d4bb3b4	commit \| diff
parent	d6205f97b7e2891ca8a99ad9078c604c6f2ecb81	commit \| diff

org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/Definition.java	diff1 \|	diff2 \|	blob \| history
org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/IntegerDefinition.java	diff1 \|	diff2 \|	blob \| history