Merge pull request #1190 from melody-rain:2.4_add_farneback_to_superres
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 29 Jul 2013 11:25:55 +0000 (15:25 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 29 Jul 2013 11:25:56 +0000 (15:25 +0400)

Trivial merge