diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2013-07-14 15:54:56 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2013-07-14 15:54:56 +0200 |
| commit | 5da2d8d5689352fe1debc8b6ad9971aa591e8905 (patch) | |
| tree | f4e0f334a072c1c74951489124f5ac840d5fc55e /main/res/layout | |
| parent | 0c01c84ec512b1300ab8a8a4e0fc6c4c203b1bb5 (diff) | |
| parent | 3a650d5f9fedf5d0499f36ca662513d398b1d81d (diff) | |
| download | cgeo-5da2d8d5689352fe1debc8b6ad9971aa591e8905.zip cgeo-5da2d8d5689352fe1debc8b6ad9971aa591e8905.tar.gz cgeo-5da2d8d5689352fe1debc8b6ad9971aa591e8905.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/res/values/strings_not_translatable.xml
main/src/cgeo/geocaching/AboutActivity.java
Diffstat (limited to 'main/res/layout')
| -rw-r--r-- | main/res/layout/about_activity.xml | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/main/res/layout/about_activity.xml b/main/res/layout/about_activity.xml index 7d7d0b6..f6ce1b8 100644 --- a/main/res/layout/about_activity.xml +++ b/main/res/layout/about_activity.xml @@ -218,14 +218,27 @@ </RelativeLayout> <TextView - android:id="@+id/changelog" + android:id="@+id/changelog_master" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="left" android:layout_margin="7dip" android:linksClickable="true" android:paddingLeft="3dip" - android:text="@string/changelog" + android:text="@string/changelog_master" + android:textColor="?text_color" + android:textColorLink="?text_color_link" + android:textSize="12dip" /> + + <TextView + android:id="@+id/changelog_release" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_margin="7dip" + android:linksClickable="true" + android:paddingLeft="3dip" + android:text="@string/changelog_release" android:textColor="?text_color" android:textColorLink="?text_color_link" android:textSize="12sp" /> @@ -254,4 +267,4 @@ </LinearLayout> </ScrollView> -</LinearLayout>
\ No newline at end of file +</LinearLayout> |