Merge branch 'master' of git://code.opencv.org/opencv
authorAlexander Mordvintsev <zzznah@gmail.com>
Mon, 17 Sep 2012 15:37:38 +0000 (19:37 +0400)
committerAlexander Mordvintsev <zzznah@gmail.com>
Mon, 17 Sep 2012 15:37:38 +0000 (19:37 +0400)
commit1017dea3325bbde264f74657745e6d092f13e50d
tree8ea3ba5355616a637a17347ac41ff26567e6f3aa
parent2a96f28bc190268fc3dd7deb90f19bf2579ed4b2
parentf58c5646b0cb9543c7ad41dbdba4ca93d1a3d00a
Merge branch 'master' of git://code.opencv.org/opencv