From 4cf12743279c603a70e1112e5529fa9017f93e78 Mon Sep 17 00:00:00 2001
From: Andrey Kamaev <no@email>
Date: Fri, 15 Jul 2011 16:50:41 +0000
Subject: [PATCH] Finished Android samples renaming

---
 samples/android/tutorial-4-mixed/.project                       | 2 +-
 samples/android/tutorial-4-mixed/res/values/strings.xml         | 2 +-
 .../src/org/opencv/samples/{s4 => tutorial4}/Sample4Mixed.java  | 0
 .../src/org/opencv/samples/{s4 => tutorial4}/Sample4View.java   | 0
 .../org/opencv/samples/{s4 => tutorial4}/SampleViewBase.java    | 0
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename samples/android/tutorial-4-mixed/src/org/opencv/samples/{s4 => tutorial4}/Sample4Mixed.java (100%)
 rename samples/android/tutorial-4-mixed/src/org/opencv/samples/{s4 => tutorial4}/Sample4View.java (100%)
 rename samples/android/tutorial-4-mixed/src/org/opencv/samples/{s4 => tutorial4}/SampleViewBase.java (100%)

diff --git a/samples/android/tutorial-4-mixed/.project b/samples/android/tutorial-4-mixed/.project
index 84ac074a74..d5f3427685 100644
--- a/samples/android/tutorial-4-mixed/.project
+++ b/samples/android/tutorial-4-mixed/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Tutorial 2 Advanced - 2. Mix Java\Native OpenCV</name>
+	<name>Tutorial 2 Advanced - 2. Mix Java+Native OpenCV</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/samples/android/tutorial-4-mixed/res/values/strings.xml b/samples/android/tutorial-4-mixed/res/values/strings.xml
index 63b97c0113..428138a741 100644
--- a/samples/android/tutorial-4-mixed/res/values/strings.xml
+++ b/samples/android/tutorial-4-mixed/res/values/strings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Tutorial 2 Advanced - 2. Mix Java\Native OpenCV</string>
+    <string name="app_name">Tutorial 2 Advanced - 2. Mix Java+Native OpenCV</string>
 </resources>
diff --git a/samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/Sample4Mixed.java b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java
similarity index 100%
rename from samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/Sample4Mixed.java
rename to samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java
diff --git a/samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/Sample4View.java b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4View.java
similarity index 100%
rename from samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/Sample4View.java
rename to samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4View.java
diff --git a/samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/SampleViewBase.java b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/SampleViewBase.java
similarity index 100%
rename from samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/SampleViewBase.java
rename to samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/SampleViewBase.java