Corrected my previous edit of OpenCV include paths (and other small edits) - resolved conflicts between mine and Arthur's edits.
Corrected my previous edit of OpenCV include paths (and other small edits) - resolved conflicts between mine and Arthur's edits.

git-svn-id: 03a8048b5ee8463be5048a3801110fb50f378627@7392 d0ab736e-dc22-4aeb-8dc9-08def0aa14fd

kmdouglass/Micro-Manager,kmdouglass/Micro-Manager