Fix merge with master
authorDavid Goulet <dgoulet@efficios.com>
Mon, 26 Mar 2012 21:02:15 +0000 (17:02 -0400)
committerDavid Goulet <dgoulet@efficios.com>
Mon, 26 Mar 2012 21:02:15 +0000 (17:02 -0400)
commitb060669ea977dcb69d9923fa55d116358b926c6e
treededb4de320f57cb718d621bb5315391095135960
parentde003c688dc5a05650a45a2fa2b8e946b9aac61b
Fix merge with master

Signed-off-by: David Goulet <dgoulet@efficios.com>
benchmark/Makefile.am
benchmark/bench-sessions.c
src/bin/lttng-sessiond/Makefile.am
This page took 0.03227 seconds and 4 git commands to generate.