Merge pull request #2834 from atinfinity:pullreq/140606-TickMeter-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 9 Jun 2014 10:29:44 +0000 (14:29 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 9 Jun 2014 10:29:44 +0000 (14:29 +0400)
commit4ef311949babe68018c570f342baf30df77c7e69
treee14e6db0778e9d9e8164ac553708a3df40d9664c
parent64344f4545b0576e732b9f5d21a7d39a1c9dcf84
parentf08d88fa78aab8b2193c80ecfb9893cddff362d5
Merge pull request #2834 from atinfinity:pullreq/140606-TickMeter-2.4