Merge pull request #240 from emchristiansen:javatest2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 14 Jan 2013 07:06:43 +0000 (11:06 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 14 Jan 2013 07:06:44 +0000 (11:06 +0400)
commitc49b23d4dda89b3f419f78509c52e217209ab421
tree32732d8973b145f9056033be3fda02cf17218e9c
parent5e2726fb17043f4e4b7aa15068b26cc8a4fc00bf
parentb0e1cb473a9453727c05f40d870121136db98dda
Merge pull request #240 from emchristiansen:javatest2.4