Merge remote-tracking branch 'upstream/master'
authorNghia Ho <nghiaho12@yahoo.com>
Thu, 26 Sep 2013 13:08:23 +0000 (23:08 +1000)
committerNghia Ho <nghiaho12@yahoo.com>
Thu, 26 Sep 2013 13:08:23 +0000 (23:08 +1000)
commit5921c776132038465d9a5ff8458478e6076628f1
treee8c13bd73b20b1577371a48272b23963161fde54
parent357e5d55f64f4f7439cc907e3b0030a59ef0b58a
parent4b203f7b1a0b1a731b98fc4e504d2bf7815a14a5
Merge remote-tracking branch 'upstream/master'
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/include/opencv2/imgproc.hpp