Merge branch 2.4

This commit is contained in:
Andrey Kamaev
2012-11-30 19:52:59 +04:00
194 changed files with 1359 additions and 147098 deletions

View File

@@ -4,7 +4,11 @@
android:versionCode="21"
android:versionName="2.1">
<application android:label="@string/app_name" android:icon="@drawable/icon">
<application
android:label="@string/app_name"
android:icon="@drawable/icon"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
<activity android:name="ColorBlobDetectionActivity"
android:label="@string/app_name"
android:screenOrientation="landscape"