Merge branch 'integration' into dev
authorkhizmax <libcds.dev@gmail.com>
Mon, 27 Apr 2015 20:23:32 +0000 (23:23 +0300)
committerkhizmax <libcds.dev@gmail.com>
Mon, 27 Apr 2015 20:23:32 +0000 (23:23 +0300)
commit19631b4ca37a3ce9dd2652904aef8d81aca4e846
tree68594638c0d544f513bf0115ad4ec3021fd0d207
parentc36dfd504a009073df6c5d22d056ccc2f1efd60e
parentf0de9e874b77ebb9bd912f25063e3bab993873f5
Merge branch 'integration' into dev

Conflicts:
cds/intrusive/split_list.h
cds/intrusive/split_list_nogc.h
cds/intrusive/split_list_rcu.h