Merge branch 'landing-2849' into upstream-master

e aborts
ge aborts
bug/bundler_fix
joev 2014-01-08 23:06:51 -06:00
commit 59890ae7bd
No known key found for this signature in database
GPG Key ID: 127B05FB3E85A2B0
1 changed files with 1 additions and 1 deletions

View File

@ -25,7 +25,7 @@ class Metasploit3 < Msf::Encoder::Xor
'Julien Tinnes <julien at cr0.org>', # original longxor encoder, which this one is based on 'Julien Tinnes <julien at cr0.org>', # original longxor encoder, which this one is based on
'juan vazquez' # byte_xori encoder 'juan vazquez' # byte_xori encoder
], ],
'Arch' => ARCH_MIPSBE, 'Arch' => ARCH_MIPSLE,
'License' => MSF_LICENSE, 'License' => MSF_LICENSE,
'Decoder' => 'Decoder' =>
{ {