Merge branch 'master' of https://github.com/Itseez/opencv
authorsprice <seth@planet-labs.com>
Wed, 11 Dec 2013 22:35:51 +0000 (14:35 -0800)
committersprice <seth@planet-labs.com>
Wed, 11 Dec 2013 22:35:51 +0000 (14:35 -0800)
commit1c15776cf57aa88bb9a0d5cb742a94880cb97c5f
treed1e002507983897e15fc4cbed49e04c2b61680c8
parent73b0827ec166f5b9e226162bae8ec960f951c87e
parentf3e2bfea7917ebcb70cd1c63dc379c4d1c6cb640
Merge branch 'master' of https://github.com/Itseez/opencv

Conflicts:
modules/imgproc/src/sumpixels.cpp
modules/imgproc/src/sumpixels.cpp