Merge pull request #1427 from SpecLad:merge-2.4

author Roman Donchenko <roman.donchenko@itseez.com>

Tue, 10 Sep 2013 14:28:19 +0000 (18:28 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Tue, 10 Sep 2013 14:28:20 +0000 (18:28 +0400)
author Roman Donchenko <roman.donchenko@itseez.com>
Tue, 10 Sep 2013 14:28:19 +0000 (18:28 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Tue, 10 Sep 2013 14:28:20 +0000 (18:28 +0400)
diff --cc .gitignore

index 1f3a89a,5c1b707..de0707a
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -7,4 -7,6 +7,5 @@@ tegra
   .sw[a-z]
   .*.swp
   tags
- -build/
   Thumbs.db
+ *.autosave
diff --cc modules/imgproc/include/opencv2/imgproc.hpp
Simple merge
author	Roman Donchenko <roman.donchenko@itseez.com>
	Tue, 10 Sep 2013 14:28:19 +0000 (18:28 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Tue, 10 Sep 2013 14:28:20 +0000 (18:28 +0400)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
modules/imgproc/include/opencv2/imgproc.hpp	patch \|	diff1 \|	diff2 \|	blob \| history