Merge pull request #409 from asmorkalov:giganetix_cams_patch_master
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 4 Feb 2013 10:57:13 +0000 (14:57 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 4 Feb 2013 10:57:14 +0000 (14:57 +0400)
commit4d785fff997dda9a120948d4697eec3d853a72e1
treed0a28385eb2d44f55ca79c5de3ebe64ed13e52ee
parent5a767863bd5c083bdd7bca62ef4b4cbbb6920875
parent75191e8f2fc11fc2ebb570cbad82f0b1c8647c63
Merge pull request #409 from asmorkalov:giganetix_cams_patch_master