Merge remote-tracking branch 'upstream/master' into SIMDFastAreaResize-2
authorIlya Lavrenov <ilya.lavrenov@itseez.com>
Mon, 17 Dec 2012 11:27:32 +0000 (15:27 +0400)
committerIlya Lavrenov <ilya.lavrenov@itseez.com>
Mon, 17 Dec 2012 11:27:32 +0000 (15:27 +0400)
commit743dce6a4b5e3b7dd9a139882a41d0158b870ac1
treedab489a84d5948a415f4faa794387c1f62e17893
parentaa0dafcc1f81ca2eee54ed152cdd571a7ec99b93
parent2508d8e2b42a9d579f00a6418194088bde19f99f
Merge remote-tracking branch 'upstream/master' into SIMDFastAreaResize-2