Merge branch 2.4

2012-11-30 19:52:59 +04:00
parent 50bebd6f0b f6ca38a579
commit e10ee89ec4
194 changed files with 1359 additions and 147098 deletions
--- a/modules/contrib/doc/facerec/src/create_csv.py
+++ b/modules/contrib/doc/facerec/src/create_csv.py
@@ -1,3 +1,5 @@
+#/usr/bin/env python
+
 import sys
 import os.path