Merge branch 'master' into gradle-conversion

kruton · Jun 10, 2015 · d6b1f6f · d6b1f6f
2 parents c65cf58 + 74508ed
commit d6b1f6f
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/app/src/main/res/layout/wiz_eula.xml b/app/src/main/res/layout/wiz_eula.xml
@@ -51,20 +51,11 @@
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
 			android:paddingTop="10dip"
+			android:autoLink="web"
 			android:text="@string/copyright_info"
 			android:textAppearance="?android:attr/textAppearanceSmall"
 			/>
 
-		<TextView
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:paddingTop="10dip"
-			android:autoLink="web"
-			android:text="You can view the full text at http://www.gnu.org/licenses/gpl-3.0.txt"
-			android:textSize="14sp"
-			android:textColor="#bebebe"
-			/>
-
  		<TextView
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"