[Ssc-dev] [guardianproject/SecureSmartCam] 9d122e: updated version

[noreply at github.com]

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

  Commit: 9d122e1d0d21d2c617c6771bea1e7253b3f12559
      https://github.com/guardianproject/SecureSmartCam/commit/9d122e1d0d21d2c617c6771bea1e7253b3f12559
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-08-23 (Tue, 23 Aug 2011)

  Changed paths:
    M AndroidManifest.xml

  Log Message:
  -----------
  updated version


  Commit: add9071d3b1fd660777f3abd9703931384780cce
      https://github.com/guardianproject/SecureSmartCam/commit/add9071d3b1fd660777f3abd9703931384780cce
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-08-23 (Tue, 23 Aug 2011)

  Changed paths:
    M AndroidManifest.xml
  M src/org/witness/sscphase1/ImageEditor.java

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

Conflicts:
	AndroidManifest.xml


Compare: https://github.com/guardianproject/SecureSmartCam/compare/50c4ef9...add9071