From: khizmax <libcds.dev@gmail.com>
Date: Mon, 27 Apr 2015 20:23:32 +0000 (+0300)
Subject: Merge branch 'integration' into dev
X-Git-Tag: v2.1.0~245^2~11
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=19631b4ca37a3ce9dd2652904aef8d81aca4e846;p=libcds.git

Merge branch 'integration' into dev

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

19631b4ca37a3ce9dd2652904aef8d81aca4e846