Merge branch 'master' of git://code.opencv.org/opencv
authorAlexander Mordvintsev <zzznah@gmail.com>
Mon, 17 Sep 2012 15:42:55 +0000 (19:42 +0400)
committerAlexander Mordvintsev <zzznah@gmail.com>
Mon, 17 Sep 2012 15:42:55 +0000 (19:42 +0400)
commit556e6c14752678bc185242304e969fd92ac32b29
treedb3e91141323fc3649efb76cd1f6a92fe2702d87
parent1017dea3325bbde264f74657745e6d092f13e50d
parentfffd263ce4782dad0e99bab6c4486270ba7c7d10
Merge branch 'master' of git://code.opencv.org/opencv