Merge pull request #1110 from SpecLad:config-cleanup

This commit is contained in:
Andrey Pavlenko
2013-07-30 17:39:35 +04:00
committed by OpenCV Buildbot
40 changed files with 233 additions and 426 deletions

View File

@@ -43,9 +43,7 @@
#ifndef __OPENCV_PRECOMP_H__
#define __OPENCV_PRECOMP_H__
#ifdef HAVE_CVCONFIG_H
#include "cvconfig.h"
#endif
#include "opencv2/contrib/contrib.hpp"
#include "opencv2/features2d/features2d.hpp"