projects / libcds.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c36dfd5 f0de9e8)
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)
Conflicts:
cds/intrusive/split_list.h
cds/intrusive/split_list_nogc.h
cds/intrusive/split_list_rcu.h


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.