Merge pull request #9248 from alalek:alloc_refactoring
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 3 Aug 2017 16:25:29 +0000 (16:25 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 3 Aug 2017 16:25:29 +0000 (16:25 +0000)
1  2 
modules/core/src/system.cpp

Simple merge