Merge pull request #871 from bitwangyaoyao:2.4_acry

2013-05-13 23:04:11 +04:00
parent fd83f2f5ca e23884a238
commit 6eb5a95a59
22 changed files with 334 additions and 1436 deletions
--- a/modules/ocl/test/test_haar.cpp
+++ b/modules/ocl/test/test_haar.cpp
@@ -12,6 +12,7 @@
 //
 // Copyright (C) 2010-2012, Institute Of Software Chinese Academy Of Science, all rights reserved.
 // Copyright (C) 2010-2012, Advanced Micro Devices, Inc., all rights reserved.
+// Copyright (C) 2010-2012, Multicoreware, Inc., all rights reserved.
 // Third party copyrights are property of their respective owners.
 //
 // @Authors