Merge branch 'master' of https://github.com/wiryls/opencv
authorMYLS <Wiryls@gmx.com>
Fri, 15 Jul 2016 10:46:07 +0000 (18:46 +0800)
committerMYLS <Wiryls@gmx.com>
Fri, 15 Jul 2016 10:46:07 +0000 (18:46 +0800)
commita9b4cdd36faa0f7cd642d75ec6b8013aa4ec812d
tree58094eefdcd10140757e0f7acbe2c184553a8f09
parent75b93b17ee8499ecae5454335b5c0158cb725354
parentb3475cbf32adccdc6ba94ec123b4ce86270b8452
Merge branch 'master' of https://github.com/wiryls/opencv