Joe Vennix f9e59c89c9 Merge branch 'reverse_http_s' into webcam_fixes ... Manually resolves conflicts in Payload.java Conflicts: androidpayload/app/src/com/metasploit/stage/Payload.java		2014-03-10 15:15:56 -05:00
..
res/values	reduce payload size	2014-02-15 13:56:43 +00:00
src/com/metasploit/stage	Merge branch 'reverse_http_s' into webcam_fixes	2014-03-10 15:15:56 -05:00
AndroidManifest.xml	get context via reflection	2014-02-24 23:09:20 +00:00
pom.xml	Fix relative paths to Metasploit repository	2013-06-12 23:44:57 +02:00