[Ssc-dev] [guardianproject/SecureSmartCam] 20cd8b: Merge branch 'master' of github.com:guardianprojec...

[noreply at github.com]

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

  Commit: 20cd8b168f432ef43c1cb52cf7b1d2a705e8dd3b
      https://github.com/guardianproject/SecureSmartCam/commit/20cd8b168f432ef43c1cb52cf7b1d2a705e8dd3b
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-16 (Thu, 16 Jun 2011)

  Changed paths:
    M jni/byte_swapping.cpp
  M jni/byte_swapping.h
  R jni/byte_swapping.o
  M jni/iptc.cpp
  M jni/iptc.h
  R jni/iptc.o
  M jni/jpeg.cpp
  M jni/jpeg.h
  R jni/jpeg.o
  M jni/jpeg_decoder.cpp
  M jni/jpeg_decoder.h
  R jni/jpeg_decoder.o
  M jni/jpeg_dht.h
  M jni/org_witness_securesmartcam_jpegredaction_JpegRedaction.cpp
  R jni/photoshop_3block.cpp
  M jni/photoshop_3block.h
  R jni/photoshop_bim.cpp
  M jni/redaction.h
  M jni/tiff_ifd.cpp
  M jni/tiff_ifd.h
  R jni/tiff_ifd.o
  M jni/tiff_tag.cpp
  M jni/tiff_tag.h
  R jni/tiff_tag.o
  M res/layout/idtagger.xml
  M res/layout/imageregioninner.xml
  M res/values/strings.xml
  A src/org/witness/sscphase1/CrowdBlurObscure.java
  M src/org/witness/sscphase1/ImageEditor.java
  M src/org/witness/sscphase1/ImageRegion.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:guardianproject/SecureSmartCam into obscurav1

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


  Commit: 88da26e70d5bbab5d880081d1496a8c5f4ed5a15
      https://github.com/guardianproject/SecureSmartCam/commit/88da26e70d5bbab5d880081d1496a8c5f4ed5a15
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-06-16 (Thu, 16 Jun 2011)

  Changed paths:
    M AndroidManifest.xml
  M assets/anon.png
  M res/layout-land/mainmenu.xml
  M res/layout/mainmenu.xml
  M src/net/londatiga/android/QuickAction.java
  M src/org/witness/sscphase1/CameraObscuraMainMenu.java
  M src/org/witness/sscphase1/ImageEditor.java
  M src/org/witness/sscphase1/ImageRegion.java
  M src/org/witness/sscphase1/PixelizeObscure.java
  M src/org/witness/sscphase1/SplashScreenActivity.java

  Log Message:
  -----------
  Merge branch 'obscurav1' of github.com:guardianproject/SecureSmartCam into obscurav1


Compare: https://github.com/guardianproject/SecureSmartCam/compare/d50b45b...88da26e