Merge pull request #2317 from blueskymonster:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 12 Feb 2014 11:14:25 +0000 (15:14 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 12 Feb 2014 11:14:26 +0000 (15:14 +0400)
commitfa38ea6d50a33ba21a47498fc23dbf22abb79ae2
treed124077466724bba287f971c4b58189d2eba3ab2
parent511e79aef7d232b1e0da94ba81c15fd0bf727b0c
parent280667978193c199af148000a358f1e6376d0f7a
Merge pull request #2317 from blueskymonster:master