Merge pull request #2560 from akarsakov:gaussianblur_integer

author Vadim Pisarevsky <vadim.pisarevsky@gmail.com>

Tue, 15 Apr 2014 09:21:25 +0000 (13:21 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Tue, 15 Apr 2014 09:21:25 +0000 (13:21 +0400)
author Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 15 Apr 2014 09:21:25 +0000 (13:21 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Tue, 15 Apr 2014 09:21:25 +0000 (13:21 +0400)
diff --cc modules/imgproc/src/filter.cpp
Simple merge
diff --cc modules/imgproc/test/ocl/test_filters.cpp
Simple merge
author	Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
	Tue, 15 Apr 2014 09:21:25 +0000 (13:21 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Tue, 15 Apr 2014 09:21:25 +0000 (13:21 +0400)
		1	2
modules/imgproc/src/filter.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/imgproc/test/ocl/test_filters.cpp	patch \|	diff1 \|	diff2 \|	blob \| history