[Ssc-dev] [guardianproject/InformaCore] b8ea58: Make some variables protected

[Harlo Holmes/LvH]

  Branch: refs/heads/master
  Home:   https://github.com/guardianproject/InformaCore
  Commit: b8ea5896ee45865c7ab0181f9e36212729628ed2
      https://github.com/guardianproject/InformaCore/commit/b8ea5896ee45865c7ab0181f9e36212729628ed2
  Author: Mikael von Pfaler <mikael.von.pfaler at gmail.com>
  Date:   2013-12-03 (Tue, 03 Dec 2013)

  Changed paths:
    M src/org/witness/informacam/intake/EntryJob.java
    M src/org/witness/informacam/intake/Intake.java

  Log Message:
  -----------
  Make some variables protected


  Commit: 4f0300984f43687d4211f1e5a5401025dd46668d
      https://github.com/guardianproject/InformaCore/commit/4f0300984f43687d4211f1e5a5401025dd46668d
  Author: Mikael von Pfaler <mikael.von.pfaler at gmail.com>
  Date:   2013-12-06 (Fri, 06 Dec 2013)

  Changed paths:
    M src/org/witness/informacam/InformaCam.java
    M src/org/witness/informacam/models/media/ILog.java
    M src/org/witness/informacam/models/media/IMediaManifest.java
    M src/org/witness/informacam/transport/GoogleDriveTransport.java

  Log Message:
  -----------
  Some threading fixes


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

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

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into mikael_glsp_tweaks


  Commit: 83f23b7a673fac8fb39fd2be8c855474a6d3cd6e
      https://github.com/guardianproject/InformaCore/commit/83f23b7a673fac8fb39fd2be8c855474a6d3cd6e
  Author: Mikael von Pfaler <mikael.von.pfaler at gmail.com>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

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

  Log Message:
  -----------
  Break out "choosePictureSize" so it can be overridden.


  Commit: ff139ff3338fb16649886a4465801fc09d440c3c
      https://github.com/guardianproject/InformaCore/commit/ff139ff3338fb16649886a4465801fc09d440c3c
  Author: Mikael von Pfaler <mikael.von.pfaler at gmail.com>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

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

  Log Message:
  -----------
  Export fixes


  Commit: 5e455791435655fec71cbb23feae15608c15f025
      https://github.com/guardianproject/InformaCore/commit/5e455791435655fec71cbb23feae15608c15f025
  Author: Mikael von Pfaler <mikael.von.pfaler at gmail.com>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M src/org/witness/informacam/InformaCam.java
    M src/org/witness/informacam/informa/embed/ImageConstructor.java
    M src/org/witness/informacam/utils/BackgroundProcessor.java

  Log Message:
  -----------
  Fix threading issues for export


  Commit: 03935f92c0d5bbc9c49f87b1456b823d96317cd8
      https://github.com/guardianproject/InformaCore/commit/03935f92c0d5bbc9c49f87b1456b823d96317cd8
  Author: Mikael von Pfaler <mikael.von.pfaler at gmail.com>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M jni/org_witness_informacam_informa_embed_ImageConstructor.cpp
    A src/de/matthiasmann/jpegdecoder/Component.java
    A src/de/matthiasmann/jpegdecoder/Huffman.java
    A src/de/matthiasmann/jpegdecoder/IDCT_2D.java
    A src/de/matthiasmann/jpegdecoder/JPEGDecoder.java
    M src/org/witness/informacam/informa/embed/ImageConstructor.java
    M src/org/witness/informacam/informa/embed/VideoConstructor.java
    M src/org/witness/informacam/intake/EntryJob.java
    M src/org/witness/informacam/models/media/IImage.java
    M src/org/witness/informacam/models/media/IMedia.java
    M src/org/witness/informacam/models/media/IVideo.java
    M src/org/witness/informacam/storage/IOService.java
    M src/org/witness/informacam/utils/MediaHasher.java

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into mikael_glsp_ilog_export


  Commit: 2334925539938e729f3057031e468008b9abe558
      https://github.com/guardianproject/InformaCore/commit/2334925539938e729f3057031e468008b9abe558
  Author: Harlo Holmes/LvH <harlo.holmes at gmail.com>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M src/org/witness/informacam/InformaCam.java
    M src/org/witness/informacam/intake/EntryJob.java
    M src/org/witness/informacam/intake/Intake.java
    M src/org/witness/informacam/models/media/ILog.java
    M src/org/witness/informacam/models/media/IMediaManifest.java
    M src/org/witness/informacam/transport/GoogleDriveTransport.java
    M src/org/witness/informacam/ui/SurfaceGrabberActivity.java
    M src/org/witness/informacam/utils/BackgroundProcessor.java

  Log Message:
  -----------
  Merge pull request #41 from mikaelvonpfaler/mikael_glsp_ilog_export

Mikael glsp ilog export


Compare: https://github.com/guardianproject/InformaCore/compare/d91dcbbaee61...233492553993