Merge branch 'master' of code.opencv.org:opencv
authorAlexander Mordvintesv <zzznah@gmail.com>
Tue, 7 Aug 2012 20:21:56 +0000 (23:21 +0300)
committerAlexander Mordvintesv <zzznah@gmail.com>
Tue, 7 Aug 2012 20:21:56 +0000 (23:21 +0300)
commit7db1f711f690ca0dd0002f43e827482ac84f8f8a
tree8ebcbb1e61dae0579214ef2de08e8941a5e487b3
parent647b1dd96c9970f257240ab29f7e7d070846849a
parente2eb81bcb28d61e7ae102c8e38078c75a8826cdb
Merge branch 'master' of code.opencv.org:opencv

Conflicts:
samples/python2/common.py
samples/python2/feature_homography.py
samples/python2/plane_ar.py
samples/python2/plane_tracker.py