Merge github.com:Itseez/opencv
authorJuan Carlos Niebles <niebles@gmail.com>
Thu, 18 Sep 2014 17:00:28 +0000 (12:00 -0500)
committerJuan Carlos Niebles <niebles@gmail.com>
Thu, 18 Sep 2014 17:00:28 +0000 (12:00 -0500)
commit0c988f00bcc3e55c7cb8f7114038d3f6a08ffc0d
tree4e92d7d450bd12cbe7a704d38f364e2f33c9bc1b
parentdc49e115274103d643568bf74b8e9b33ad6a8bef
parentd1afa0e370fc418d8d602d48599517d962f3d721
Merge github.com:Itseez/opencv