Merging Sandor's changes with backup (non-trivial merge)

2010-08-24 17:25:50 -03:00
parent 9befe8ae5f
commit 60ea4c5f77
35 changed files with 1736 additions and 498 deletions
@@ -95,8 +95,9 @@ limitations under the License.
      android:textSize="20sp" />
    <TextView
      android:layout_height="wrap_content"
+      android:id="@+id/about_version_register"
      android:layout_width="wrap_content"
-      android:text="@string/version"
+      android:text="@string/unknown"
      android:textSize="20sp" />
  </TableRow>