Merge branch 'master' of git://5.9.49.245/opencv
authormarina.kolpakova <marina.kolpakova@itseez.com>
Wed, 25 Jul 2012 04:33:51 +0000 (08:33 +0400)
committermarina.kolpakova <marina.kolpakova@itseez.com>
Wed, 25 Jul 2012 04:33:51 +0000 (08:33 +0400)
commitcf92e4b4e070f66869baad5e99db947fb0c71370
tree712cfc8d4e7f4e85343302d9d9de5c7492145d90
parent51f7a3ca81b3c0babfa8d7f1852b8fc0b44fa0c7
parent794b07ba11a666feaddf212986e1bdb3d1b353d7
Merge branch 'master' of git://5.9.49.245/opencv