From: David Goulet <dgoulet@efficios.com>
Date: Wed, 22 Feb 2012 22:40:58 +0000 (-0500)
Subject: Merge branch 'master' into benchmark
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=f5e5283c278f5e742f8844e7acee778fb0d8991b;p=lttng-tools.git

Merge branch 'master' into benchmark

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

f5e5283c278f5e742f8844e7acee778fb0d8991b
diff --cc Makefile.am
index bab695466,b16632a4a..a02a1d1d3
--- a/Makefile.am
+++ b/Makefile.am
@@@ -7,7 -5,7 +7,10 @@@ SUBDIRS = src/common/ 
  		  include \
  		  doc
  
+ dist_doc_DATA = LICENSE \
+                 ChangeLog
+ 
+ EXTRA_DIST = extras/lttng-bash_completion
++
 +bench:
 +	./benchmark/runall.sh
- 
- dist_doc_DATA = ChangeLog