Merge pull request #307 from taka-no-me:lena.png

d169f62d · Andrey Kamaev · OpenCV Buildbot · f3f55b30 · 90ff4e6f · f3f55b30
Commit d169f62d authored Jan 19, 2013 by Andrey Kamaev Committed by OpenCV Buildbot Jan 19, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 0 deletions

lena.jpg modules/java/android_test/res/drawable/lena.jpg +0 -0

lena.png modules/java/android_test/res/drawable/lena.png +0 -0

No files found.
--- a/modules/java/android_test/res/drawable/lena.jpg
+++ b/modules/java/android_test/res/drawable/lena.jpg
--- a/modules/java/android_test/res/drawable/lena.png
+++ b/modules/java/android_test/res/drawable/lena.png