Merge pull request #3111 from vpisarev:make_ximgproc_compile
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 15 Aug 2014 15:08:34 +0000 (15:08 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 15 Aug 2014 15:08:34 +0000 (15:08 +0000)

Trivial merge