[Ssc-dev] [guardianproject/SecureSmartCam] 7444d7: nothing to see here

[noreply at github.com]

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

  Commit: 7444d76eb8101fa8b964e6b0f47de48e661d586a
      https://github.com/guardianproject/SecureSmartCam/commit/7444d76eb8101fa8b964e6b0f47de48e661d586a
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-21 (Fri, 21 Oct 2011)

  Changed paths:
    M .classpath

  Log Message:
  -----------
  nothing to see here


  Commit: fcdec2c9eaa00ebbcdf52990ea39b8b65757208e
      https://github.com/guardianproject/SecureSmartCam/commit/fcdec2c9eaa00ebbcdf52990ea39b8b65757208e
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-10-21 (Fri, 21 Oct 2011)

  Changed paths:
    M .classpath
  M AndroidManifest.xml
  A doc/spec/informaCam_specification_phase-ii.doc.docx
  A libs/armeabi/libdatabase_sqlcipher.so
  A libs/armeabi/libsqlcipher.so
  A libs/armeabi/libsqlcipher_android-10.so
  A libs/armeabi/libsqlcipher_android-11.so
  A libs/armeabi/libsqlcipher_android-12.so
  A libs/armeabi/libsqlcipher_android-13.so
  A libs/armeabi/libsqlcipher_android-7.so
  A libs/armeabi/libsqlcipher_android-8.so
  A libs/armeabi/libsqlcipher_android-9.so
  A libs/armeabi/libsqlcipher_android.so
  A libs/armeabi/libstlport_shared.so
  A libs/commons-codec.jar
  A libs/guava-r09.jar
  A libs/sqlcipher.jar
  A res/drawable/border_idtag.9.png
  R res/layout/encrypttagger.xml
  R res/layout/idtagger.xml
  R res/layout/imageprefs.xml
  A res/layout/informa_options.xml
  A res/layout/informaeditor.xml
  M res/values/strings.xml
  M res/xml/preferences.xml
  A src/org/witness/informa/InformaEditor.java
  A src/org/witness/informa/InformaOptions.java
  A src/org/witness/informa/utils/ExifModifier.java
  A src/org/witness/informa/utils/MetadataParser.java
  A src/org/witness/informa/utils/SensorSucker.java
  M src/org/witness/securesmartcam/ImageEditor.java
  M src/org/witness/securesmartcam/ImageRegion.java
  M src/org/witness/securesmartcam/filters/BlurObscure.java
  M src/org/witness/securesmartcam/filters/ConsentTagger.java
  M src/org/witness/securesmartcam/filters/CrowdPixelizeObscure.java
  M src/org/witness/securesmartcam/filters/MaskObscure.java
  M src/org/witness/securesmartcam/filters/PaintSquareObscure.java
  M src/org/witness/securesmartcam/filters/PixelizeObscure.java
  M src/org/witness/securesmartcam/filters/RegionProcesser.java
  M src/org/witness/securesmartcam/filters/TintObscure.java
  M src/org/witness/securesmartcam/jpegredaction/JpegRedaction.java

  Log Message:
  -----------
  Merge branch 'informav1' into obscurav1

Conflicts:
	.classpath
	src/org/witness/securesmartcam/ImageEditor.java
	src/org/witness/securesmartcam/ImageRegion.java
	src/org/witness/securesmartcam/filters/BlurObscure.java
	src/org/witness/securesmartcam/filters/CrowdPixelizeObscure.java
	src/org/witness/securesmartcam/filters/PaintSquareObscure.java
	src/org/witness/securesmartcam/filters/TintObscure.java
	src/org/witness/securesmartcam/jpegredaction/JpegRedaction.java


Compare: https://github.com/guardianproject/SecureSmartCam/compare/116d4bf...fcdec2c