[Ssc-dev] [guardianproject/InformaCore] cb796b: removed debug

[harlo]

  Branch: refs/heads/master
  Home:   https://github.com/guardianproject/InformaCore
  Commit: cb796b4f33bf8e33d915793a6eea555818009041
      https://github.com/guardianproject/InformaCore/commit/cb796b4f33bf8e33d915793a6eea555818009041
  Author: harlo <harlo.holmes at gmail.com>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    M src/org/witness/informacam/Debug.java

  Log Message:
  -----------
  removed debug


  Commit: f11bf6eec31adef084bb9c1289dea4f177b2d729
      https://github.com/guardianproject/InformaCore/commit/f11bf6eec31adef084bb9c1289dea4f177b2d729
  Author: harlo <harlo.holmes at gmail.com>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    M external/ODKFormParser
    M src/org/witness/informacam/InformaCam.java
    M src/org/witness/informacam/informa/embed/ImageConstructor.java
    M src/org/witness/informacam/informa/embed/VideoConstructor.java
    M src/org/witness/informacam/informa/suckers/PhoneSucker.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/transport/ITransportData.java
    M src/org/witness/informacam/models/transport/ITransportStub.java
    M src/org/witness/informacam/transport/GlobaleaksTransport.java
    M src/org/witness/informacam/transport/Transport.java
    M src/org/witness/informacam/ui/WizardActivity.java

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


  Commit: 73336b9fe032206bb10ac2a3d0f70fd96fbb65e1
      https://github.com/guardianproject/InformaCore/commit/73336b9fe032206bb10ac2a3d0f70fd96fbb65e1
  Author: harlo <harlo.holmes at gmail.com>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    M src/org/witness/informacam/Debug.java
    M src/org/witness/informacam/InformaCam.java
    M src/org/witness/informacam/intake/EntryJob.java
    M src/org/witness/informacam/models/credentials/IUser.java

  Log Message:
  -----------
  updates for encryption preferences; including a commented-out patch to reconcile the originalImageHandling preference and the newer assetEncryption preference.


Compare: https://github.com/guardianproject/InformaCore/compare/37533c65c917...73336b9fe032