Merge commit '7999eaee97df27c88866d1dfd130068dba955e88' into dev
authorkhizmax <libcds.dev@gmail.com>
Thu, 23 Oct 2014 18:04:23 +0000 (22:04 +0400)
committerkhizmax <libcds.dev@gmail.com>
Thu, 23 Oct 2014 18:04:23 +0000 (22:04 +0400)
commit92c1bbab088df29ed018aa6bd73a18277109e04e
tree85f8eae73713b07bd2a42f9dd68d2a57a5906036
parente2234d7bf0391ad4d85979155135d6647af0c50d
parent7999eaee97df27c88866d1dfd130068dba955e88
Merge commit '7999eaee97df27c88866d1dfd130068dba955e88' into dev

Conflicts:
projects/Win/vc12/hdr-test-ordered-list.vcxproj
projects/Win/vc12/hdr-test-ordered-list.vcxproj.filters
projects/Win/vc12/hdr-test-ordered-list.vcxproj
projects/Win/vc12/hdr-test-ordered-list.vcxproj.filters