Merge branch 'master' of git://code.opencv.org/opencv
authorMarius Muja <mariusm@cs.ubc.ca>
Fri, 28 Sep 2012 17:40:51 +0000 (10:40 -0700)
committerMarius Muja <mariusm@cs.ubc.ca>
Fri, 28 Sep 2012 17:40:51 +0000 (10:40 -0700)
commitae4ff999d78f842f849b679d896ad5c368214ea1
tree7cad27b4c3e30175972f6d95039e2f96bb6bd329
parent5cf6c5f0b273cf73be623c1df4ea2a01c3c4be8a
parent06e7101795110278b27952152e29cf33cb29f5ae
Merge branch 'master' of git://code.opencv.org/opencv