[Ssc-dev] [guardianproject/InformaCore] 34bd2d: Support back and front cameras

Harlo Holmes/LvH harlo.holmes at gmail.com
Wed Nov 20 15:49:20 EST 2013 

  Branch: refs/heads/master
  Home:   https://github.com/guardianproject/InformaCore
  Commit: 34bd2d4076da1fb7f941c98b2ef846c2cbaacbb5
      https://github.com/guardianproject/InformaCore/commit/34bd2d4076da1fb7f941c98b2ef846c2cbaacbb5
  Author: Mikael von Pfaler <mikael.von.pfaler at gmail.com>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    M src/org/witness/informacam/ui/SurfaceGrabberActivity.java

  Log Message:
  -----------
  Support back and front cameras


  Commit: bce980854719d73e790a674ad529e7c9e64245d7
      https://github.com/guardianproject/InformaCore/commit/bce980854719d73e790a674ad529e7c9e64245d7
  Author: Mikael von Pfaler <mikael.von.pfaler at gmail.com>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    M src/org/witness/informacam/ui/WizardActivity.java

  Log Message:
  -----------
  Wizard null checks


  Commit: 9b332979b7d0ba1ca302f477d73b9b3d823f50df
      https://github.com/guardianproject/InformaCore/commit/9b332979b7d0ba1ca302f477d73b9b3d823f50df
  Author: Mikael von Pfaler <mikael.von.pfaler at gmail.com>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M src/org/witness/informacam/ui/SurfaceGrabberActivity.java

  Log Message:
  -----------
  Prevent snapping picture when not in preview mode


  Commit: dcbc6ab4a9b177c37dcdbe6ff89849bcb95e2384
      https://github.com/guardianproject/InformaCore/commit/dcbc6ab4a9b177c37dcdbe6ff89849bcb95e2384
  Author: Mikael von Pfaler <mikael.von.pfaler at gmail.com>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M src/org/witness/informacam/models/media/IMediaManifest.java

  Log Message:
  -----------
  Fix index bug for limit


  Commit: 2279ff647523ec6eb757b7f4ff5af8b1ec080dc8
      https://github.com/guardianproject/InformaCore/commit/2279ff647523ec6eb757b7f4ff5af8b1ec080dc8
  Author: Mikael von Pfaler <mikael.von.pfaler at gmail.com>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M external/google-play-services_lib/project.properties
    M project.properties
    M src/org/witness/informacam/informa/InformaService.java
    M src/org/witness/informacam/informa/suckers/AccelerometerSucker.java
    A src/org/witness/informacam/informa/suckers/EnvironmentalSucker.java
    M src/org/witness/informacam/informa/suckers/PhoneSucker.java
    M src/org/witness/informacam/models/forms/IForm.java
    M src/org/witness/informacam/models/j3m/IDCIMDescriptor.java
    M src/org/witness/informacam/models/j3m/IGenealogy.java
    M src/org/witness/informacam/models/media/IMedia.java
    M src/org/witness/informacam/utils/Constants.java

  Log Message:
  -----------
  Merge branch 'master' into mikael_glsp_tweaks


  Commit: c1d94674a7330fd8478850a6f7831278d6f871a0
      https://github.com/guardianproject/InformaCore/commit/c1d94674a7330fd8478850a6f7831278d6f871a0
  Author: Mikael von Pfaler <mikael.von.pfaler at gmail.com>
  Date:   2013-11-11 (Mon, 11 Nov 2013)

  Changed paths:
    M res/values/strings.xml
    M src/org/witness/informacam/crypto/SignatureService.java
    M src/org/witness/informacam/informa/InformaService.java
    M src/org/witness/informacam/models/j3m/IDCIMDescriptor.java
    M src/org/witness/informacam/models/j3m/IRegionData.java
    M src/org/witness/informacam/models/media/ILog.java
    M src/org/witness/informacam/models/media/IMedia.java
    M src/org/witness/informacam/models/media/IRegion.java
    M src/org/witness/informacam/transport/GlobaleaksTransport.java
    M src/org/witness/informacam/ui/CameraActivity.java

  Log Message:
  -----------
  Merge branch 'master' into mikael_glsp_tweaks


  Commit: 0f387c0a83cb3ffa6c684e4a1ef3b1848b9ef001
      https://github.com/guardianproject/InformaCore/commit/0f387c0a83cb3ffa6c684e4a1ef3b1848b9ef001
  Author: Mikael von Pfaler <mikael.von.pfaler at gmail.com>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    M src/org/witness/informacam/ui/SurfaceGrabberActivity.java

  Log Message:
  -----------
  Override to allow camera facing other way


  Commit: e444f8fa7367d914225eba8fc978bc66cbf75a92
      https://github.com/guardianproject/InformaCore/commit/e444f8fa7367d914225eba8fc978bc66cbf75a92
  Author: Mikael von Pfaler <mikael.von.pfaler at gmail.com>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    A external/google-play-services/.gitignore
    A external/google-play-services/.project
    A external/google-play-services/AndroidManifest.xml
    A external/google-play-services/README.txt
    A external/google-play-services/libs/google-play-services.jar
    A external/google-play-services/libs/google-play-services.jar.properties
    A external/google-play-services/proguard-project.txt
    A external/google-play-services/project.properties
    A external/google-play-services/res/color/common_signin_btn_text_dark.xml
    A external/google-play-services/res/color/common_signin_btn_text_light.xml
    A external/google-play-services/res/drawable-hdpi/common_signin_btn_icon_disabled_dark.9.png
    A external/google-play-services/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_dark.9.png
    A external/google-play-services/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_light.9.png
    A external/google-play-services/res/drawable-hdpi/common_signin_btn_icon_disabled_light.9.png
    A external/google-play-services/res/drawable-hdpi/common_signin_btn_icon_focus_dark.9.png
    A external/google-play-services/res/drawable-hdpi/common_signin_btn_icon_focus_light.9.png
    A external/google-play-services/res/drawable-hdpi/common_signin_btn_icon_normal_dark.9.png
    A external/google-play-services/res/drawable-hdpi/common_signin_btn_icon_normal_light.9.png
    A external/google-play-services/res/drawable-hdpi/common_signin_btn_icon_pressed_dark.9.png
    A external/google-play-services/res/drawable-hdpi/common_signin_btn_icon_pressed_light.9.png
    A external/google-play-services/res/drawable-hdpi/common_signin_btn_text_disabled_dark.9.png
    A external/google-play-services/res/drawable-hdpi/common_signin_btn_text_disabled_focus_dark.9.png
    A external/google-play-services/res/drawable-hdpi/common_signin_btn_text_disabled_focus_light.9.png
    A external/google-play-services/res/drawable-hdpi/common_signin_btn_text_disabled_light.9.png
    A external/google-play-services/res/drawable-hdpi/common_signin_btn_text_focus_dark.9.png
    A external/google-play-services/res/drawable-hdpi/common_signin_btn_text_focus_light.9.png
    A external/google-play-services/res/drawable-hdpi/common_signin_btn_text_normal_dark.9.png
    A external/google-play-services/res/drawable-hdpi/common_signin_btn_text_normal_light.9.png
    A external/google-play-services/res/drawable-hdpi/common_signin_btn_text_pressed_dark.9.png
    A external/google-play-services/res/drawable-hdpi/common_signin_btn_text_pressed_light.9.png
    A external/google-play-services/res/drawable-mdpi/common_signin_btn_icon_disabled_dark.9.png
    A external/google-play-services/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_dark.9.png
    A external/google-play-services/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_light.9.png
    A external/google-play-services/res/drawable-mdpi/common_signin_btn_icon_disabled_light.9.png
    A external/google-play-services/res/drawable-mdpi/common_signin_btn_icon_focus_dark.9.png
    A external/google-play-services/res/drawable-mdpi/common_signin_btn_icon_focus_light.9.png
    A external/google-play-services/res/drawable-mdpi/common_signin_btn_icon_normal_dark.9.png
    A external/google-play-services/res/drawable-mdpi/common_signin_btn_icon_normal_light.9.png
    A external/google-play-services/res/drawable-mdpi/common_signin_btn_icon_pressed_dark.9.png
    A external/google-play-services/res/drawable-mdpi/common_signin_btn_icon_pressed_light.9.png
    A external/google-play-services/res/drawable-mdpi/common_signin_btn_text_disabled_dark.9.png
    A external/google-play-services/res/drawable-mdpi/common_signin_btn_text_disabled_focus_dark.9.png
    A external/google-play-services/res/drawable-mdpi/common_signin_btn_text_disabled_focus_light.9.png
    A external/google-play-services/res/drawable-mdpi/common_signin_btn_text_disabled_light.9.png
    A external/google-play-services/res/drawable-mdpi/common_signin_btn_text_focus_dark.9.png
    A external/google-play-services/res/drawable-mdpi/common_signin_btn_text_focus_light.9.png
    A external/google-play-services/res/drawable-mdpi/common_signin_btn_text_normal_dark.9.png
    A external/google-play-services/res/drawable-mdpi/common_signin_btn_text_normal_light.9.png
    A external/google-play-services/res/drawable-mdpi/common_signin_btn_text_pressed_dark.9.png
    A external/google-play-services/res/drawable-mdpi/common_signin_btn_text_pressed_light.9.png
    A external/google-play-services/res/drawable-xhdpi/common_signin_btn_icon_disabled_dark.9.png
    A external/google-play-services/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_dark.9.png
    A external/google-play-services/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_light.9.png
    A external/google-play-services/res/drawable-xhdpi/common_signin_btn_icon_disabled_light.9.png
    A external/google-play-services/res/drawable-xhdpi/common_signin_btn_icon_focus_dark.9.png
    A external/google-play-services/res/drawable-xhdpi/common_signin_btn_icon_focus_light.9.png
    A external/google-play-services/res/drawable-xhdpi/common_signin_btn_icon_normal_dark.9.png
    A external/google-play-services/res/drawable-xhdpi/common_signin_btn_icon_normal_light.9.png
    A external/google-play-services/res/drawable-xhdpi/common_signin_btn_icon_pressed_dark.9.png
    A external/google-play-services/res/drawable-xhdpi/common_signin_btn_icon_pressed_light.9.png
    A external/google-play-services/res/drawable-xhdpi/common_signin_btn_text_disabled_dark.9.png
    A external/google-play-services/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_dark.9.png
    A external/google-play-services/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_light.9.png
    A external/google-play-services/res/drawable-xhdpi/common_signin_btn_text_disabled_light.9.png
    A external/google-play-services/res/drawable-xhdpi/common_signin_btn_text_focus_dark.9.png
    A external/google-play-services/res/drawable-xhdpi/common_signin_btn_text_focus_light.9.png
    A external/google-play-services/res/drawable-xhdpi/common_signin_btn_text_normal_dark.9.png
    A external/google-play-services/res/drawable-xhdpi/common_signin_btn_text_normal_light.9.png
    A external/google-play-services/res/drawable-xhdpi/common_signin_btn_text_pressed_dark.9.png
    A external/google-play-services/res/drawable-xhdpi/common_signin_btn_text_pressed_light.9.png
    A external/google-play-services/res/drawable/common_signin_btn_icon_dark.xml
    A external/google-play-services/res/drawable/common_signin_btn_icon_light.xml
    A external/google-play-services/res/drawable/common_signin_btn_text_dark.xml
    A external/google-play-services/res/drawable/common_signin_btn_text_light.xml
    A external/google-play-services/res/values-af/strings.xml
    A external/google-play-services/res/values-am/strings.xml
    A external/google-play-services/res/values-ar/strings.xml
    A external/google-play-services/res/values-be/strings.xml
    A external/google-play-services/res/values-bg/strings.xml
    A external/google-play-services/res/values-ca/strings.xml
    A external/google-play-services/res/values-cs/strings.xml
    A external/google-play-services/res/values-da/strings.xml
    A external/google-play-services/res/values-de/strings.xml
    A external/google-play-services/res/values-el/strings.xml
    A external/google-play-services/res/values-en-rGB/strings.xml
    A external/google-play-services/res/values-es-rUS/strings.xml
    A external/google-play-services/res/values-es/strings.xml
    A external/google-play-services/res/values-et/strings.xml
    A external/google-play-services/res/values-fa/strings.xml
    A external/google-play-services/res/values-fi/strings.xml
    A external/google-play-services/res/values-fr/strings.xml
    A external/google-play-services/res/values-hi/strings.xml
    A external/google-play-services/res/values-hr/strings.xml
    A external/google-play-services/res/values-hu/strings.xml
    A external/google-play-services/res/values-in/strings.xml
    A external/google-play-services/res/values-it/strings.xml
    A external/google-play-services/res/values-iw/strings.xml
    A external/google-play-services/res/values-ja/strings.xml
    A external/google-play-services/res/values-ko/strings.xml
    A external/google-play-services/res/values-lt/strings.xml
    A external/google-play-services/res/values-lv/strings.xml
    A external/google-play-services/res/values-ms/strings.xml
    A external/google-play-services/res/values-nb/strings.xml
    A external/google-play-services/res/values-nl/strings.xml
    A external/google-play-services/res/values-pl/strings.xml
    A external/google-play-services/res/values-pt-rBR/strings.xml
    A external/google-play-services/res/values-pt-rPT/strings.xml
    A external/google-play-services/res/values-pt/strings.xml
    A external/google-play-services/res/values-ro/strings.xml
    A external/google-play-services/res/values-ru/strings.xml
    A external/google-play-services/res/values-sk/strings.xml
    A external/google-play-services/res/values-sl/strings.xml
    A external/google-play-services/res/values-sr/strings.xml
    A external/google-play-services/res/values-sv/strings.xml
    A external/google-play-services/res/values-sw/strings.xml
    A external/google-play-services/res/values-th/strings.xml
    A external/google-play-services/res/values-tl/strings.xml
    A external/google-play-services/res/values-tr/strings.xml
    A external/google-play-services/res/values-uk/strings.xml
    A external/google-play-services/res/values-vi/strings.xml
    A external/google-play-services/res/values-zh-rCN/strings.xml
    A external/google-play-services/res/values-zh-rTW/strings.xml
    A external/google-play-services/res/values-zu/strings.xml
    A external/google-play-services/res/values/colors.xml
    A external/google-play-services/res/values/maps_attrs.xml
    A external/google-play-services/res/values/strings.xml
    A external/google-play-services/src/android/UnusedStub.java
    R external/google-play-services_lib/.gitignore
    R external/google-play-services_lib/.project
    R external/google-play-services_lib/.settings/org.eclipse.jdt.core.prefs
    R external/google-play-services_lib/AndroidManifest.xml
    R external/google-play-services_lib/README.txt
    R external/google-play-services_lib/libs/google-play-services.jar
    R external/google-play-services_lib/libs/google-play-services.jar.properties
    R external/google-play-services_lib/proguard-project.txt
    R external/google-play-services_lib/project.properties
    R external/google-play-services_lib/res/color/common_signin_btn_text_dark.xml
    R external/google-play-services_lib/res/color/common_signin_btn_text_light.xml
    R external/google-play-services_lib/res/drawable-hdpi/common_signin_btn_icon_disabled_dark.9.png
    R external/google-play-services_lib/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_dark.9.png
    R external/google-play-services_lib/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_light.9.png
    R external/google-play-services_lib/res/drawable-hdpi/common_signin_btn_icon_disabled_light.9.png
    R external/google-play-services_lib/res/drawable-hdpi/common_signin_btn_icon_focus_dark.9.png
    R external/google-play-services_lib/res/drawable-hdpi/common_signin_btn_icon_focus_light.9.png
    R external/google-play-services_lib/res/drawable-hdpi/common_signin_btn_icon_normal_dark.9.png
    R external/google-play-services_lib/res/drawable-hdpi/common_signin_btn_icon_normal_light.9.png
    R external/google-play-services_lib/res/drawable-hdpi/common_signin_btn_icon_pressed_dark.9.png
    R external/google-play-services_lib/res/drawable-hdpi/common_signin_btn_icon_pressed_light.9.png
    R external/google-play-services_lib/res/drawable-hdpi/common_signin_btn_text_disabled_dark.9.png
    R external/google-play-services_lib/res/drawable-hdpi/common_signin_btn_text_disabled_focus_dark.9.png
    R external/google-play-services_lib/res/drawable-hdpi/common_signin_btn_text_disabled_focus_light.9.png
    R external/google-play-services_lib/res/drawable-hdpi/common_signin_btn_text_disabled_light.9.png
    R external/google-play-services_lib/res/drawable-hdpi/common_signin_btn_text_focus_dark.9.png
    R external/google-play-services_lib/res/drawable-hdpi/common_signin_btn_text_focus_light.9.png
    R external/google-play-services_lib/res/drawable-hdpi/common_signin_btn_text_normal_dark.9.png
    R external/google-play-services_lib/res/drawable-hdpi/common_signin_btn_text_normal_light.9.png
    R external/google-play-services_lib/res/drawable-hdpi/common_signin_btn_text_pressed_dark.9.png
    R external/google-play-services_lib/res/drawable-hdpi/common_signin_btn_text_pressed_light.9.png
    R external/google-play-services_lib/res/drawable-mdpi/common_signin_btn_icon_disabled_dark.9.png
    R external/google-play-services_lib/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_dark.9.png
    R external/google-play-services_lib/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_light.9.png
    R external/google-play-services_lib/res/drawable-mdpi/common_signin_btn_icon_disabled_light.9.png
    R external/google-play-services_lib/res/drawable-mdpi/common_signin_btn_icon_focus_dark.9.png
    R external/google-play-services_lib/res/drawable-mdpi/common_signin_btn_icon_focus_light.9.png
    R external/google-play-services_lib/res/drawable-mdpi/common_signin_btn_icon_normal_dark.9.png
    R external/google-play-services_lib/res/drawable-mdpi/common_signin_btn_icon_normal_light.9.png
    R external/google-play-services_lib/res/drawable-mdpi/common_signin_btn_icon_pressed_dark.9.png
    R external/google-play-services_lib/res/drawable-mdpi/common_signin_btn_icon_pressed_light.9.png
    R external/google-play-services_lib/res/drawable-mdpi/common_signin_btn_text_disabled_dark.9.png
    R external/google-play-services_lib/res/drawable-mdpi/common_signin_btn_text_disabled_focus_dark.9.png
    R external/google-play-services_lib/res/drawable-mdpi/common_signin_btn_text_disabled_focus_light.9.png
    R external/google-play-services_lib/res/drawable-mdpi/common_signin_btn_text_disabled_light.9.png
    R external/google-play-services_lib/res/drawable-mdpi/common_signin_btn_text_focus_dark.9.png
    R external/google-play-services_lib/res/drawable-mdpi/common_signin_btn_text_focus_light.9.png
    R external/google-play-services_lib/res/drawable-mdpi/common_signin_btn_text_normal_dark.9.png
    R external/google-play-services_lib/res/drawable-mdpi/common_signin_btn_text_normal_light.9.png
    R external/google-play-services_lib/res/drawable-mdpi/common_signin_btn_text_pressed_dark.9.png
    R external/google-play-services_lib/res/drawable-mdpi/common_signin_btn_text_pressed_light.9.png
    R external/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_icon_disabled_dark.9.png
    R external/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_dark.9.png
    R external/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_light.9.png
    R external/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_icon_disabled_light.9.png
    R external/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_icon_focus_dark.9.png
    R external/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_icon_focus_light.9.png
    R external/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_icon_normal_dark.9.png
    R external/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_icon_normal_light.9.png
    R external/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_icon_pressed_dark.9.png
    R external/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_icon_pressed_light.9.png
    R external/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_text_disabled_dark.9.png
    R external/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_dark.9.png
    R external/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_light.9.png
    R external/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_text_disabled_light.9.png
    R external/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_text_focus_dark.9.png
    R external/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_text_focus_light.9.png
    R external/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_text_normal_dark.9.png
    R external/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_text_normal_light.9.png
    R external/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_text_pressed_dark.9.png
    R external/google-play-services_lib/res/drawable-xhdpi/common_signin_btn_text_pressed_light.9.png
    R external/google-play-services_lib/res/drawable/common_signin_btn_icon_dark.xml
    R external/google-play-services_lib/res/drawable/common_signin_btn_icon_light.xml
    R external/google-play-services_lib/res/drawable/common_signin_btn_text_dark.xml
    R external/google-play-services_lib/res/drawable/common_signin_btn_text_light.xml
    R external/google-play-services_lib/res/values-af/strings.xml
    R external/google-play-services_lib/res/values-am/strings.xml
    R external/google-play-services_lib/res/values-ar/strings.xml
    R external/google-play-services_lib/res/values-be/strings.xml
    R external/google-play-services_lib/res/values-bg/strings.xml
    R external/google-play-services_lib/res/values-ca/strings.xml
    R external/google-play-services_lib/res/values-cs/strings.xml
    R external/google-play-services_lib/res/values-da/strings.xml
    R external/google-play-services_lib/res/values-de/strings.xml
    R external/google-play-services_lib/res/values-el/strings.xml
    R external/google-play-services_lib/res/values-en-rGB/strings.xml
    R external/google-play-services_lib/res/values-es-rUS/strings.xml
    R external/google-play-services_lib/res/values-es/strings.xml
    R external/google-play-services_lib/res/values-et/strings.xml
    R external/google-play-services_lib/res/values-fa/strings.xml
    R external/google-play-services_lib/res/values-fi/strings.xml
    R external/google-play-services_lib/res/values-fr/strings.xml
    R external/google-play-services_lib/res/values-hi/strings.xml
    R external/google-play-services_lib/res/values-hr/strings.xml
    R external/google-play-services_lib/res/values-hu/strings.xml
    R external/google-play-services_lib/res/values-in/strings.xml
    R external/google-play-services_lib/res/values-it/strings.xml
    R external/google-play-services_lib/res/values-iw/strings.xml
    R external/google-play-services_lib/res/values-ja/strings.xml
    R external/google-play-services_lib/res/values-ko/strings.xml
    R external/google-play-services_lib/res/values-lt/strings.xml
    R external/google-play-services_lib/res/values-lv/strings.xml
    R external/google-play-services_lib/res/values-ms/strings.xml
    R external/google-play-services_lib/res/values-nb/strings.xml
    R external/google-play-services_lib/res/values-nl/strings.xml
    R external/google-play-services_lib/res/values-pl/strings.xml
    R external/google-play-services_lib/res/values-pt-rBR/strings.xml
    R external/google-play-services_lib/res/values-pt-rPT/strings.xml
    R external/google-play-services_lib/res/values-pt/strings.xml
    R external/google-play-services_lib/res/values-ro/strings.xml
    R external/google-play-services_lib/res/values-ru/strings.xml
    R external/google-play-services_lib/res/values-sk/strings.xml
    R external/google-play-services_lib/res/values-sl/strings.xml
    R external/google-play-services_lib/res/values-sr/strings.xml
    R external/google-play-services_lib/res/values-sv/strings.xml
    R external/google-play-services_lib/res/values-sw/strings.xml
    R external/google-play-services_lib/res/values-th/strings.xml
    R external/google-play-services_lib/res/values-tl/strings.xml
    R external/google-play-services_lib/res/values-tr/strings.xml
    R external/google-play-services_lib/res/values-uk/strings.xml
    R external/google-play-services_lib/res/values-vi/strings.xml
    R external/google-play-services_lib/res/values-zh-rCN/strings.xml
    R external/google-play-services_lib/res/values-zh-rTW/strings.xml
    R external/google-play-services_lib/res/values-zu/strings.xml
    R external/google-play-services_lib/res/values/colors.xml
    R external/google-play-services_lib/res/values/maps_attrs.xml
    R external/google-play-services_lib/res/values/strings.xml
    R external/google-play-services_lib/src/android/UnusedStub.java
    M project.properties
    M setup-ant.sh
    M src/org/witness/informacam/informa/InformaService.java
    M src/org/witness/informacam/informa/SensorLogger.java
    M src/org/witness/informacam/informa/suckers/GeoFusedSucker.java
    M src/org/witness/informacam/informa/suckers/PhoneSucker.java
    M src/org/witness/informacam/models/j3m/IDCIMDescriptor.java
    M src/org/witness/informacam/models/media/IVideoRegion.java
    M src/org/witness/informacam/storage/IOService.java
    M src/org/witness/informacam/utils/Constants.java

  Log Message:
  -----------
  Merge branch 'master' into mikael_glsp_tweaks


  Commit: 5a5192792934de5d206e88087b5fb6a52b3d7b66
      https://github.com/guardianproject/InformaCore/commit/5a5192792934de5d206e88087b5fb6a52b3d7b66
  Author: Harlo Holmes/LvH <harlo.holmes at gmail.com>
  Date:   2013-11-20 (Wed, 20 Nov 2013)

  Changed paths:
    M src/org/witness/informacam/models/media/IMediaManifest.java
    M src/org/witness/informacam/ui/SurfaceGrabberActivity.java
    M src/org/witness/informacam/ui/WizardActivity.java

  Log Message:
  -----------
  Merge pull request #34 from mikaelvonpfaler/mikael_glsp_tweaks

Mikael glsp tweaks


Compare: https://github.com/guardianproject/InformaCore/compare/24fba522fd4d...5a5192792934

More information about the Ssc-dev mailing list