Merge pull request #1216 from alekcac:sphinx
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 6 Aug 2013 10:31:14 +0000 (14:31 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 6 Aug 2013 10:31:15 +0000 (14:31 +0400)
commit2911b1214595f67af84c4db256a9f1b0e192e138
tree36daad4393c9e826e989db8a7809b2b117e40991
parentb2d1d87ed13e334de90b64e89d4229d6e1f8276b
parentb84b8db2774f8709f30553c2e882ce33fa2ad62f
Merge pull request #1216 from alekcac:sphinx