From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 5 Jul 2013 23:26:57 +0000 (-0400)
Subject: Merge branch 'master' into bindings/python
X-Git-Tag: v1.2.0-rc1~77
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=92c6a024cd3e81293bd39fd2b322e12ce57ea502

Merge branch 'master' into bindings/python

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

92c6a024cd3e81293bd39fd2b322e12ce57ea502
diff --cc .gitignore
index e4562869,752308e7..c60c0e4b
--- a/.gitignore
+++ b/.gitignore
@@@ -1,5 -1,4 +1,5 @@@
- /tests/test-bitfield
 +*~
+ /tests/lib/test-bitfield
  /tests/lib/test-seeks
  *.o
  *.a
@@@ -33,6 -27,4 +33,7 @@@ converter/babeltrace-lo
  core
  formats/ctf/metadata/ctf-parser.output
  stamp-h1
 +bindings/python/babeltrace.i
 +bindings/python/babeltrace.py
 +bindings/python/babeltrace_wrap.c
+ babeltrace.pc