Merge pull request #1907 from severin-lemaignan:emscripten-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 3 Dec 2013 09:38:10 +0000 (13:38 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 3 Dec 2013 09:38:10 +0000 (13:38 +0400)
commitdf136339ff593df27af98a2a71b54eed74f4bb16
tree706fedf08a5624b30f3d4e3a1f7315ea0ade91f8
parent3ff16200867d1c659efd17bb8bfee633366f7b05
parent9ce9fc3361decee8ac2381fc0dfcff551927ed7e
Merge pull request #1907 from severin-lemaignan:emscripten-2.4