Commit b6a97e3e authored by Alexander Alekhin's avatar Alexander Alekhin

Merge pull request #515 from isdamir:master

parents e8c6b2a7 cd7b3ae4
......@@ -47,6 +47,7 @@ the use of this software, even if advised of the possibility of such damage.
#include <cfloat>
#include "opencv2/core/cvdef.h"
#include "opencv2/core/cvstd.hpp"
#undef emit //fix for qt
namespace cv {
namespace face {
//! @addtogroup face
......@@ -99,4 +100,4 @@ public:
//! @}
}
}
#endif
\ No newline at end of file
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment