Added fix in CMakeLists.txt for contrib module.
Native camera libraries updated.

Android 4.3 support added;
ANY camera index support fixed;
applyProperties now uses camera->reconnect() instead close/connect for Android 4.x.
(cherry picked from commit fff91eef0bd301e791173259ccf884c23397c956)
New Tegra detector with Android 4.3 support added. Manager version++.
(cherry picked from commit aa00b5a0ab3d7289af8ab2006f8521fd3ed17e92)

Conflicts:

	platforms/android/service/engine/jni/BinderComponent/TegraDetector.cpp
OpenCV version++. Current OpenCv version 2.4.6.2
fix for bug #3219 (undefined reference in GPU samples)
Updated with comments of speclad
Bug #1890 Opencv 2.4.0 with QT 4.7.4 and cvcreatebutton exception fixed.

QVector range check exception fixed.
Initial commit for Conjugate Gradient method

Implementation is based on
http://www.cs.cmu.edu/~quake-papers/painless-conjugate-gradient.pdf

So far we only have basic interface and empty test. But it compiles at
least.
Refined interface for Conjugate Gradient

Some interface was refined (most notably, the method for returning
Hessian was removed and the method for getting gradient was added as
optional to base Solver::Function class) and basic code for
setters/getters was added. Now is the time for the real work on an
algorithm.
Finish implementing the Nonlinear Conjugate Gradient

Now everything is prepared for the pull request.
Minor fixes

Fix failed builds that opencv's buildbot has got.
Added the copyright statements

Added the copyrights missing in all files that required so.
Add cv::logPolar, cv::linearPolar, and a python example
fix #3296 : Unsupported gpu architecture 'compute_21'
Added -l prefix to EXTRA_COMPONENTS when generating pkg-config file
Record OpenCV build type among the test properties.

Because apparently I love running performance tests for debug builds.
Merge pull request #1620 from SpecLad:record-build-type
In Java bindings, wrap version constants into functions to prevent inlining.

Java inlines static finals if they're defined with a constant expression. In
case of version constants we don't want that to happen, since they obviously
change from version to version. If the user substitutes a different OpenCV
jar without recompiling, we want user code to still have relevant values for
the version constants.

This arranges that by turning constant values into function calls, which no
longer count as a constant expression.
Delete an import of junit.framework.Assert, which is deprecated in JUnit 4.x.

We don't use it, anyway.
Merge pull request #1627 from SpecLad:java-version-no-inline