update & tag version

pennlabs · Nov 27, 2017 · 3caff4c · 3caff4c
1 parent aa595f5
commit 3caff4c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/PennMobile/PennMobile.iml b/PennMobile/PennMobile.iml
@@ -79,13 +79,16 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />

diff --git a/PennMobile/src/main/res/values/strings.xml b/PennMobile/src/main/res/values/strings.xml
@@ -72,7 +72,7 @@
     </string-array>
     <string name="google_api_origin">origin</string>
     <string name="google_api_dest">destination</string>
-    <string name="no_permissionf_map">Permission not granted for using Google Map</string>
+    <string name="no_permission_map">Permission not granted for using Google Map</string>
     <string name="ask_permission_fail">Access of your location is required to use this feature.</string>
     <string name="no_map_beardman">Map is not provided by the phone.</string>
     <string name="no_map_description">We were unable to\nload your map.</string>