[Ssc-dev] [guardianproject/InformaCore] 2ef391: Merge branch 'master' of github.com:guardianprojec...

Harlo Holmes/LvH harlo.holmes at gmail.com
Tue Dec 10 16:21:23 EST 2013 

  Branch: refs/heads/master
  Home:   https://github.com/guardianproject/InformaCore
  Commit: 2ef391ccc5dd9b13adb7c28d81369a0644ce161b
      https://github.com/guardianproject/InformaCore/commit/2ef391ccc5dd9b13adb7c28d81369a0644ce161b
  Author: harlo <LvH at VIDEOCLASH.local>
  Date:   2013-11-03 (Sun, 03 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/utils/Constants.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:guardianproject/InformaCam


  Commit: 75d9fa850fb581f1d0211660bc2f0629b9af9d8d
      https://github.com/guardianproject/InformaCore/commit/75d9fa850fb581f1d0211660bc2f0629b9af9d8d
  Author: harlo <LvH at VIDEOCLASH.local>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M proguard-project.txt
    M src/org/witness/informacam/transport/GlobaleaksTransport.java
    A src/org/witness/informacam/transport/GoogleDriveTransport.java
    M src/org/witness/informacam/transport/Transport.java
    M src/org/witness/informacam/utils/Constants.java

  Log Message:
  -----------
  stubs for google drive transport


  Commit: ab3d02d2c2ef64a01602b3c59da9d808b19f095a
      https://github.com/guardianproject/InformaCore/commit/ab3d02d2c2ef64a01602b3c59da9d808b19f095a
  Author: harlo <LvH at VIDEOCLASH.local>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M .classpath
    A libs/google-api-client-1.15.0-rc.jar
    A libs/google-api-client-android-1.15.0-rc.jar
    A libs/google-api-services-drive-v2-rev82-1.15.0-rc.jar
    A libs/google-http-client-1.15.0-rc.jar
    A libs/google-http-client-android-1.15.0-rc.jar
    A libs/google-http-client-gson-1.15.0-rc.jar
    A libs/google-oauth-client-1.15.0-rc.jar
    A libs/protobuf-java-2.4.1.jar
    M src/org/witness/informacam/InformaCam.java
    M src/org/witness/informacam/transport/GoogleDriveTransport.java
    M src/org/witness/informacam/ui/CameraActivity.java
    M src/org/witness/informacam/ui/SurfaceGrabberActivity.java
    M src/org/witness/informacam/ui/WizardActivity.java
    M src/org/witness/informacam/ui/screens/WizardStepThree.java
    A src/org/witness/informacam/utils/ActivityPipe.java
    M src/org/witness/informacam/utils/Constants.java

  Log Message:
  -----------
  handlers for out-of-activity authentication for google drive.  UNTESTED but will test before merging to master.


  Commit: 519cd6d8f4d7de8103dc9bbd23eab0e77633a1f2
      https://github.com/guardianproject/InformaCore/commit/519cd6d8f4d7de8103dc9bbd23eab0e77633a1f2
  Author: harlo <LvH at VIDEOCLASH.local>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M src/org/witness/informacam/informa/InformaService.java
    M src/org/witness/informacam/models/media/IMedia.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:guardianproject/InformaCam into harlo_task_2290


  Commit: d7d4feae9b6535159fca8ca8dc4a7a729af00aed
      https://github.com/guardianproject/InformaCore/commit/d7d4feae9b6535159fca8ca8dc4a7a729af00aed
  Author: harlo <LvH at VIDEOCLASH.local>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M .classpath
    R libs/google-api-client-1.15.0-rc.jar
    R libs/google-api-client-android-1.15.0-rc.jar
    R libs/google-api-services-drive-v2-rev82-1.15.0-rc.jar
    R libs/google-http-client-1.15.0-rc.jar
    R libs/google-http-client-android-1.15.0-rc.jar
    R libs/google-http-client-gson-1.15.0-rc.jar
    R libs/google-oauth-client-1.15.0-rc.jar
    R libs/jackson-core-2.1.3.jar
    R libs/jackson-core-asl-1.9.11.jar
    R libs/jsr305-1.3.9.jar
    R libs/protobuf-java-2.4.1.jar
    M src/org/witness/informacam/models/media/IVideoRegion.java
    R src/org/witness/informacam/transport/GoogleDriveTransport.java
    M src/org/witness/informacam/ui/SurfaceGrabberActivity.java

  Log Message:
  -----------
  removing extra drive cruft, adding in some stuff mikael included.


  Commit: 84531caf33564ddb41c6592a4c5c0081245005d3
      https://github.com/guardianproject/InformaCore/commit/84531caf33564ddb41c6592a4c5c0081245005d3
  Author: harlo <LvH at VIDEOCLASH.local>
  Date:   2013-11-16 (Sat, 16 Nov 2013)

  Changed paths:
    M external/android-ffmpeg-java
    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 res/values/strings.xml
    M setup-ant.sh
    M src/org/witness/informacam/crypto/SignatureService.java
    M src/org/witness/informacam/informa/InformaService.java
    M src/org/witness/informacam/informa/SensorLogger.java
    M src/org/witness/informacam/informa/embed/VideoConstructor.java
    M src/org/witness/informacam/informa/suckers/AccelerometerSucker.java
    M src/org/witness/informacam/informa/suckers/EnvironmentalSucker.java
    M src/org/witness/informacam/informa/suckers/GeoFusedSucker.java
    M src/org/witness/informacam/informa/suckers/GeoHiResSucker.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/j3m/IRegionData.java
    M src/org/witness/informacam/models/media/IImage.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/models/media/IVideo.java
    M src/org/witness/informacam/models/media/IVideoRegion.java
    M src/org/witness/informacam/storage/IOService.java
    M src/org/witness/informacam/transport/GlobaleaksTransport.java
    M src/org/witness/informacam/ui/CameraActivity.java
    M src/org/witness/informacam/ui/SurfaceGrabberActivity.java
    M src/org/witness/informacam/utils/Constants.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:guardianproject/InformaCam

Conflicts:
	src/org/witness/informacam/transport/GlobaleaksTransport.java


  Commit: 93937171f21c2f7dbbd51ad6fda1d4b3dad9a049
      https://github.com/guardianproject/InformaCore/commit/93937171f21c2f7dbbd51ad6fda1d4b3dad9a049
  Author: harlo <LvH at VIDEOCLASH.local>
  Date:   2013-11-16 (Sat, 16 Nov 2013)

  Changed paths:
    M external/android-ffmpeg-java

  Log Message:
  -----------
  Merge branch 'master' of github.com:guardianproject/InformaCam


  Commit: 6528021f8f9a6bc7ebe20afb3f519f98480ddd53
      https://github.com/guardianproject/InformaCore/commit/6528021f8f9a6bc7ebe20afb3f519f98480ddd53
  Author: harlo <LvH at VIDEOCLASH.local>
  Date:   2013-11-17 (Sun, 17 Nov 2013)

  Changed paths:
    M external/android-ffmpeg-java
    M src/org/witness/informacam/informa/embed/VideoConstructor.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:guardianproject/InformaCam


  Commit: 5faed07fe28499f83ba94ddc29c6d57d70d689a2
      https://github.com/guardianproject/InformaCore/commit/5faed07fe28499f83ba94ddc29c6d57d70d689a2
  Author: harlo <LvH at VIDEOCLASH.local>
  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 branch 'master' of github.com:guardianproject/InformaCam into harlo_task_2290


  Commit: 0054e6b5ef4e38e181204bf03414cda65c911c65
      https://github.com/guardianproject/InformaCore/commit/0054e6b5ef4e38e181204bf03414cda65c911c65
  Author: harlo <LvH at VIDEOCLASH.local>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

  Changed paths:
    M src/org/witness/informacam/transport/GlobaleaksTransport.java
    M src/org/witness/informacam/transport/GoogleDriveTransport.java
    M src/org/witness/informacam/transport/Transport.java
    M src/org/witness/informacam/transport/TransportUtility.java
    M src/org/witness/informacam/ui/WizardActivity.java
    M src/org/witness/informacam/utils/Constants.java

  Log Message:
  -----------
  stubbing out google drive transport


  Commit: f840344c87c93eddf3c947508b2c8590cfc00876
      https://github.com/guardianproject/InformaCore/commit/f840344c87c93eddf3c947508b2c8590cfc00876
  Author: harlo <LvH at VIDEOCLASH.local>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

  Changed paths:
    M .classpath
    R libs/jackson-core-2.1.3.jar
    R libs/jackson-core-asl-1.9.11.jar
    R libs/jsr305-1.3.9.jar
    M src/org/witness/informacam/InformaCam.java
    M src/org/witness/informacam/models/media/IVideoRegion.java
    M src/org/witness/informacam/ui/CameraActivity.java
    M src/org/witness/informacam/ui/SurfaceGrabberActivity.java
    M src/org/witness/informacam/ui/WizardActivity.java
    M src/org/witness/informacam/ui/screens/WizardStepThree.java
    A src/org/witness/informacam/utils/ActivityPipe.java
    M src/org/witness/informacam/utils/Constants.java

  Log Message:
  -----------
  merging..


  Commit: 8aa375cb9d49cc1337947aaa00aae72603a0dec5
      https://github.com/guardianproject/InformaCore/commit/8aa375cb9d49cc1337947aaa00aae72603a0dec5
  Author: harlo <LvH at VIDEOCLASH.local>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

  Changed paths:
    M src/org/witness/informacam/InformaCam.java
    M src/org/witness/informacam/transport/GoogleDriveTransport.java
    M src/org/witness/informacam/ui/CameraActivity.java
    M src/org/witness/informacam/ui/WizardActivity.java
    M src/org/witness/informacam/ui/screens/WizardStepThree.java
    R src/org/witness/informacam/utils/ActivityPipe.java
    M src/org/witness/informacam/utils/Constants.java

  Log Message:
  -----------
  clean up


  Commit: 6010beac7ac333e49c43ed29a27e3512b192910f
      https://github.com/guardianproject/InformaCore/commit/6010beac7ac333e49c43ed29a27e3512b192910f
  Author: harlo <LvH at VIDEOCLASH.local>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

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

  Log Message:
  -----------
  merge problem fixed


  Commit: 4f9a897c9e5efe862d31d3d8239dd1f2b5008cc6
      https://github.com/guardianproject/InformaCore/commit/4f9a897c9e5efe862d31d3d8239dd1f2b5008cc6
  Author: harlo <LvH at VIDEOCLASH.local>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

  Changed paths:
    M src/org/witness/informacam/transport/GlobaleaksTransport.java
    M src/org/witness/informacam/transport/GoogleDriveTransport.java
    M src/org/witness/informacam/transport/Transport.java

  Log Message:
  -----------
  now it works, but still have to handle initial oauth better...


  Commit: caff57d76ce113e8d0e23143b29673a71a6cfe87
      https://github.com/guardianproject/InformaCore/commit/caff57d76ce113e8d0e23143b29673a71a6cfe87
  Author: harlo <LvH at VIDEOCLASH.local>
  Date:   2013-11-22 (Fri, 22 Nov 2013)

  Changed paths:
    M src/org/witness/informacam/utils/Constants.java

  Log Message:
  -----------
  minor fix to public credential upload


  Commit: 560d56b97853dd99fa6f259d1468f508a90fc2db
      https://github.com/guardianproject/InformaCore/commit/560d56b97853dd99fa6f259d1468f508a90fc2db
  Author: harlo <LvH at VIDEOCLASH.local>
  Date:   2013-12-10 (Tue, 10 Dec 2013)

  Changed paths:
    M src/org/witness/informacam/models/media/IMedia.java
    M src/org/witness/informacam/utils/Constants.java

  Log Message:
  -----------
  fixes to shareHash, and moved into core rather than the app


  Commit: 00b34d0b9b534849e5883610eff09f6e248b72b7
      https://github.com/guardianproject/InformaCore/commit/00b34d0b9b534849e5883610eff09f6e248b72b7
  Author: Harlo Holmes/LvH <harlo.holmes at gmail.com>
  Date:   2013-12-10 (Tue, 10 Dec 2013)

  Changed paths:
    M .classpath
    R libs/jackson-core-2.1.3.jar
    R libs/jackson-core-asl-1.9.11.jar
    R libs/jsr305-1.3.9.jar
    M proguard-project.txt
    M src/org/witness/informacam/InformaCam.java
    M src/org/witness/informacam/models/media/IMedia.java
    M src/org/witness/informacam/models/media/IVideoRegion.java
    M src/org/witness/informacam/transport/GlobaleaksTransport.java
    A src/org/witness/informacam/transport/GoogleDriveTransport.java
    M src/org/witness/informacam/transport/Transport.java
    M src/org/witness/informacam/transport/TransportUtility.java
    M src/org/witness/informacam/ui/SurfaceGrabberActivity.java
    M src/org/witness/informacam/ui/WizardActivity.java
    M src/org/witness/informacam/ui/screens/WizardStepThree.java
    M src/org/witness/informacam/utils/Constants.java

  Log Message:
  -----------
  Merge pull request #35 from guardianproject/harlo_bug_2746

Harlo bug 2746


Compare: https://github.com/guardianproject/InformaCore/compare/5a5192792934...00b34d0b9b53

More information about the Ssc-dev mailing list