[Ssc-dev] [guardianproject/SecureSmartCam] 49090e: Merge branch 'n8fr8-crypto'

[noreply at github.com]

Branch: refs/heads/master
Home:   https://github.com/guardianproject/SecureSmartCam

Commit: 49090e8f229f719bf4151174cd756aeea4671c48
    https://github.com/guardianproject/SecureSmartCam/commit/49090e8f229f719bf4151174cd756aeea4671c48
Author: Nathan Freitas <nathan at freitas.net>
Date:   2011-04-19 (Tue, 19 Apr 2011)

Changed paths:
  M AndroidManifest.xml
  M LICENSE
  R README.txt
  R doc/metadata/NS/Subject/index.php
  R doc/metadata/NS/index.php
  M res/layout/mainmenu.xml
  M res/layout/splashscreen.xml
  M res/layout/walkthrough.xml
  M src/org/witness/sscphase1/BlurObscure.java
  M src/org/witness/sscphase1/CameraObscuraMainMenu.java
  R src/org/witness/sscphase1/EncryptTagger.java
  M src/org/witness/sscphase1/GoogleFaceDetection.java
  M src/org/witness/sscphase1/ImageEditor.java
  M src/org/witness/sscphase1/SplashScreenActivity.java
  M src/org/witness/sscphase1/secure/Apg.java
  A src/org/witness/sscphase1/secure/EncryptObscureMethod.java
  A src/org/witness/sscphase1/secure/EncryptTagger.java
  A src/org/witness/sscphase1/secure/MediaHasher.java

Log Message:
-----------
Merge branch 'n8fr8-crypto'

Conflicts:
	src/org/witness/sscphase1/ImageEditor.java


Commit: 9f4a3c6c9ecb52be9f34cb9bf31e86217305cb88
    https://github.com/guardianproject/SecureSmartCam/commit/9f4a3c6c9ecb52be9f34cb9bf31e86217305cb88
Author: Nathan Freitas <nathan at freitas.net>
Date:   2011-04-19 (Tue, 19 Apr 2011)

Changed paths:
  M src/org/witness/sscphase1/BlurObscure.java

Log Message:
-----------
reset to use Blue color simple method


Compare: https://github.com/guardianproject/SecureSmartCam/compare/f9933f6...9f4a3c6