Merge pull request #974 from lijpsummer/master
authorSteven Barth <steven@midlink.org>
Mon, 2 Mar 2015 20:18:25 +0000 (21:18 +0100)
committerSteven Barth <steven@midlink.org>
Mon, 2 Mar 2015 20:18:25 +0000 (21:18 +0100)
commit47d28bcf80514b0dc03a6d982cdc62f5da666e88
tree8ba7ce570e26be2974d4abf126d3b33d14c58c25
parent2cfa68a64cfdb4a3f9d1d0ba19bac913c2a65f14
parente6503d16a65c2c02fa87e4bff0010c3ed925a49a
Merge pull request #974 from lijpsummer/master

update opencv version as 2.4.11