Merge pull request #2129 from ilya-lavrenov:mix_fix
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 9 Jan 2014 13:04:03 +0000 (17:04 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 9 Jan 2014 13:04:03 +0000 (17:04 +0400)
commit560cfa567296ef3f87b5c153f387dc29521df02d
treeeac2d1f621033d91840e44da8c9c0e327f0a8a11
parentdfeba1e8dd6fdb0c19d7adb936767bfd9181294c
parent9899cf7519a8a8bd59a032e1bb04634dc4590493
Merge pull request #2129 from ilya-lavrenov:mix_fix