merged 2.4 into trunk

2012-04-30 14:33:52 +00:00
parent 3f1c6d7357
commit d5a0088bbe
194 changed files with 10158 additions and 8225 deletions
--- a/samples/gpu/brox_optical_flow.cpp
+++ b/samples/gpu/brox_optical_flow.cpp
@@ -215,7 +215,6 @@ int main(int argc, const char* argv[])
            switch (key)
            {
            case 27:
-                return 0;

            case 'A':
                if (currentFrame > 0)