Merged the trunk r8852:8880

This commit is contained in:
Andrey Kamaev
2012-07-02 11:04:43 +00:00
parent 304dac7f00
commit b368f99d03
60 changed files with 507 additions and 255 deletions

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Tutorial 4 (Advanced) - Mix Java+Native OpenCV</name>
<name>OpenCV Tutorial 4 - Mix Java+Native OpenCV</name>
<comment></comment>
<projects>
</projects>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Tutorial 4 (Advanced) - Mix Java+Native OpenCV</string>
<string name="app_name">OCV T4 Mix Java+Native OpenCV</string>
</resources>