Merge branch 'master' into dev
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Thu, 1 Mar 2012 22:23:47 +0000 (17:23 -0500)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Thu, 1 Mar 2012 22:23:47 +0000 (17:23 -0500)
commit2253b139ffb6a4eca7291b60083cc5206a6e128d
tree2254f7865e3142ea994d80f4bae8bd89415e0b45
parenta025b017d398818300ad45c92284116d64c56fc1
parent67e5f39161d80ea3d972a37ecf76f45a260c480d
Merge branch 'master' into dev

Conflicts:
liblttng-ust/ltt-events.c
liblttng-ust/lttng-context-vtid.c
liblttng-ust/lttng-ust-comm.c
libringbuffer/ring_buffer_frontend.c

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
include/lttng/ust-events.h
liblttng-ust/ltt-events.c
This page took 0.025083 seconds and 4 git commands to generate.