Merge branch 'master' of git://github.com/vpas/opencv into nonlocal_means
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 20 Aug 2012 20:23:48 +0000 (00:23 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 20 Aug 2012 20:23:48 +0000 (00:23 +0400)
commit35754c0c03e6f904edabef27152ded469d9b3055
treef7bbd085f378876fe6a3d26caa71578f363ce2f8
parentee0dd4d4967082c6bf3e4ba8d8bb3871720a7ec8
parent1f42de39a33a3a5e2f9f21d4ea36219b42d6a865
Merge branch 'master' of git://github.com/vpas/opencv into nonlocal_means