Merge remote-tracking branch 'refs/remotes/opencv/master' into FileStorageJSON
authorMYLS <Wiryls@gmx.com>
Wed, 10 Aug 2016 16:47:13 +0000 (00:47 +0800)
committerMYLS <Wiryls@gmx.com>
Wed, 10 Aug 2016 16:47:13 +0000 (00:47 +0800)
commit26a8c45e2376a01ffcc003ccd37bc3f44b235c0a
treeabbc096d6f68302644d4635ef2e8c76cc4746105
parenta9b4cdd36faa0f7cd642d75ec6b8013aa4ec812d
parentf210602d1e7f18182b38b528fb9046b2357c2e53
Merge remote-tracking branch 'refs/remotes/opencv/master' into FileStorageJSON