From 1c28f0a005bb0f57343511a9b5a0da5cac15516c Mon Sep 17 00:00:00 2001
From: Thad Hughes <thadh@google.com>
Date: Wed, 25 Dec 2013 19:23:26 -0800
Subject: [PATCH] Added credits

---
 res/layout/about_activity.xml | 17 +++++++++++++++++
 res/values/strings.xml        |  1 +
 todo.txt                      |  1 -
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/res/layout/about_activity.xml b/res/layout/about_activity.xml
index 8b3410f..f8409d6 100644
--- a/res/layout/about_activity.xml
+++ b/res/layout/about_activity.xml
@@ -71,6 +71,23 @@
             android:paddingBottom="10dip"
              />
 
+         <TextView
+            android:id="@+id/textView5"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/contributionsFrom" />
+
+        <TextView
+            android:id="@+id/textView6"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:autoLink="web"
+            android:clickable="true"
+            android:text="Dominik Köppl, Uwe Trottmann, Michael Vogel, Fabio"
+            android:paddingBottom="10dip"
+             />
+        
         <TextView
             android:id="@+id/license"
             android:layout_width="wrap_content"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f78b8c1..b14259d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -78,6 +78,7 @@
   <string name="myEmail" formatted="false">thad.hughes@gmail.com</string>
   <string name="webPage">For more information, see:</string>
   <string name="webPageUrl">http://code.google.com/p/quickdic-dictionary/</string>
+  <string name="contributionsFrom">Contributions from:</string>
   
   <string name="license">QuickDic contains code copyrighted by Google and released under the Apache 2.0 license.</string>
   <string name="licenseUrl">http://www.apache.org/licenses/LICENSE-2.0</string>
diff --git a/todo.txt b/todo.txt
index 3eeffdf..215f3b2 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,3 +1,2 @@
 * Back button in top left
-* Contributions from:
 * HtmlEntries inline, expandable.
\ No newline at end of file
-- 
2.43.0