-
Roman Donchenko authored
Conflicts: modules/core/include/opencv2/core/version.hpp
9b7e77cc
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| cpp | Java: removed usages of Ptr<T>::addref(). | |
| java | Merge commit '83cdd43a' into merge-2.4 |
Conflicts: modules/core/include/opencv2/core/version.hpp
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| cpp | Java: removed usages of Ptr<T>::addref(). | |
| java | Merge commit '83cdd43a' into merge-2.4 |