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

[noreply at github.com]

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

Commit: 73e03b771a864f4dc7fba0160643b02bc7c532fd
    https://github.com/guardianproject/SecureSmartCam/commit/73e03b771a864f4dc7fba0160643b02bc7c532fd
Author: Nathan Freitas <nathan at freitas.net>
Date:   2011-04-22 (Fri, 22 Apr 2011)

Changed paths:
  M AndroidManifest.xml
  M res/drawable/ic_launcher_ssc.png

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

Conflicts:
	AndroidManifest.xml


Commit: c4e5713fe4beff4d1dfadbb7e4993a36a68fc595
    https://github.com/guardianproject/SecureSmartCam/commit/c4e5713fe4beff4d1dfadbb7e4993a36a68fc595
Author: Nathan Freitas <nathan at freitas.net>
Date:   2011-04-22 (Fri, 22 Apr 2011)

Changed paths:
  M res/layout/imageregioninner.xml
  M src/org/witness/sscphase1/ImageEditor.java
  M src/org/witness/sscphase1/ImageRegion.java

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

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


Compare: https://github.com/guardianproject/SecureSmartCam/compare/4ec65b0...c4e5713