diff options
| author | Kenny Root <kenny@the-b.org> | 2009-09-13 06:40:22 +0000 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2009-09-13 06:40:22 +0000 |
| commit | 27a55e18e3f1d7f84077baeb6d20be5e8657a18e (patch) | |
| tree | 99228aaf1aebc33af0e4d3943eefc03a2c0e5797 | |
| parent | 34219a39daf6e8fa202ac00c7fa8956523c06e82 (diff) | |
| download | connectbot-27a55e18e3f1d7f84077baeb6d20be5e8657a18e.tar.gz connectbot-27a55e18e3f1d7f84077baeb6d20be5e8657a18e.tar.bz2 connectbot-27a55e18e3f1d7f84077baeb6d20be5e8657a18e.zip | |
Remove conflicting id from Colors layout
git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@412 df292f66-193f-0410-a5fc-6d59da041ff2
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | res/layout/act_colors.xml | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6a2b063..1d9d284 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,7 +2,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.connectbot" android:versionName="1.6-dev" - android:versionCode="199"> + android:versionCode="200"> <application android:icon="@drawable/icon" diff --git a/res/layout/act_colors.xml b/res/layout/act_colors.xml index f399c7a..96fe218 100644 --- a/res/layout/act_colors.xml +++ b/res/layout/act_colors.xml @@ -46,7 +46,6 @@ android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_toLeftOf="@+id/bg" - android:id="@+id/fg_label" android:paddingTop="12dp" /> |