Merge branch 'master' into urcu/ht
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Sat, 3 Sep 2011 14:48:44 +0000 (10:48 -0400)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Sat, 3 Sep 2011 14:48:44 +0000 (10:48 -0400)
commit92cfe223501f564d3bd726a6c580702daeef4198
tree03e90bb9b2bea82d2f3adee34bab18f5d5599234
parent76412f2410948c653536a4e34c468814c4cb2544
parentae4510b56f1b6a65562ecd1c79dc0d470274aaf2
Merge branch 'master' into urcu/ht

Conflicts:
Makefile.am

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Makefile.am
tests/Makefile.am
This page took 0.032448 seconds and 4 git commands to generate.