Merge branch 'master' into bindings/python
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Fri, 5 Jul 2013 23:26:57 +0000 (19:26 -0400)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Fri, 5 Jul 2013 23:26:57 +0000 (19:26 -0400)
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
1  2 
.gitignore
configure.ac

diff --cc .gitignore
index e4562869ae1de93909c82cf64dc475491c112e4a,752308e7b38a2c732d48688eed2dbfeafd26ba0e..c60c0e4b00092d6df13395aba313e85cce08953e
@@@ -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
diff --cc configure.ac
Simple merge
This page took 0.04074 seconds and 4 git commands to generate.