Merge branch 'develop' of /home/weava/Projects/ContestApp with confli…

…cts.
Team-Andronerds · Mar 21, 2015 · 1e2718e · 1e2718e
1 parent 8c061aa
commit 1e2718e
Show file tree

Hide file tree

Showing 8 changed files with 287 additions and 276 deletions.
diff --git a/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/.gradle/2.2.1/taskArtifacts/cache.properties.lock
diff --git a/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/.gradle/2.2.1/taskArtifacts/fileHashes.bin
diff --git a/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
diff --git a/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
diff --git a/app/build/intermediates/incremental/mergeResources/debug/merger.xml b/app/build/intermediates/incremental/mergeResources/debug/merger.xml
diff --git a/app/build/intermediates/res/debug/values/values.xml b/app/build/intermediates/res/debug/values/values.xml
@@ -172,6 +172,7 @@
     <color name="hint_foreground_material_light">@color/bright_foreground_disabled_material_light</color>
     <!-- From: file:/home/weava/Projects/ContestApp/app/src/main/res/values/colors.xml -->
     <eat-comment/>
+    <color name="home_progress_bg">#81C084</color>
     <item name="item_selected_color" type="color">#EEEEEE</item>
     <item name="item_selected_text_color" type="color">#4CAF50</item>
     <color name="light_green_body_color">#81C784</color>
@@ -206,6 +207,7 @@
     <color name="secondary_text_disabled_material_light">#24000000</color>
     <!-- From: file:/home/weava/Projects/ContestApp/app/src/main/res/values/colors.xml -->
     <eat-comment/>
+    <item name="stats_divider_color" type="color">#AAAAAA</item>
     <item name="status_bar_color" type="color">#388E3C</item>
     <!-- From: file:/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/values/values.xml -->
     <eat-comment/>
@@ -437,6 +439,7 @@
     <dimen name="profile_info">16sp</dimen>
     <dimen name="profile_info_spacing">40dip</dimen>
     <dimen name="profile_label">18sp</dimen>
+    <dimen name="stats_info_right_spacing">40dip</dimen>
     <dimen name="stats_info_spacing">20dip</dimen>
     <!-- From: file:/home/weava/Projects/ContestApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/res/values/values.xml -->
     <eat-comment/>

diff --git a/app/build/intermediates/res/resources-debug.ap_ b/app/build/intermediates/res/resources-debug.ap_
diff --git a/app/build/intermediates/symbols/debug/R.txt b/app/build/intermediates/symbols/debug/R.txt