Merge branch 'master' into urcu/ht-shrink
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Wed, 2 Nov 2011 00:15:55 +0000 (20:15 -0400)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Wed, 2 Nov 2011 00:15:55 +0000 (20:15 -0400)
commitcc6b0c208a9707f8a64609a51167290caeace288
tree3569f1dd8afb3ada060c6d509d85dc428bd2d4a5
parent7f52427be704778d53f85e17fb71629b50ada827
parenta0b7f7ea3fc3339a1c42caffd53ce9f056e5b901
Merge branch 'master' into urcu/ht-shrink

Fixed conflicts:
tests/test_urcu_qsbr.c
tests/test_urcu_qsbr_gc.c

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