Merge branch 'master' of https://github.com/edgarriba/opencv
authoredgarriba <edgar.riba@gmail.com>
Mon, 18 Aug 2014 19:46:23 +0000 (21:46 +0200)
committeredgarriba <edgar.riba@gmail.com>
Mon, 18 Aug 2014 19:46:23 +0000 (21:46 +0200)
commit211a8d31d5f4f69ddc0c4d5d7a1f3c9fcbdf4219
tree76d4e3a02dbaf8b227971bcf39599f9be4be9802
parent620387fbe11426229dab4d1f5f13399407d5ee26
parenta37640cdd048e284d969126f572e33cecc40a0b3
Merge branch 'master' of https://github.com/edgarriba/opencv