Samuel Huckins 149c3ecc63 Various merge resolutions from master <- staging ...

* --ask option ported to new location
* --version option now works
* MSF version updated
* All specs passing

2014-08-15 11:33:31 -05:00

..

anemone

…

bit-struct

Fix improper use of host-endian or signed pack/unpack

2014-06-30 02:50:10 -05:00

metasm

Retabbed PR rapid7#3181

2014-04-02 15:51:11 -05:00

metasploit

Various merge resolutions from master <- staging

2014-08-15 11:33:31 -05:00

msf

Various merge resolutions from master <- staging

2014-08-15 11:33:31 -05:00

nessus

…

net

Various merge resolutions from master <- staging

2014-08-15 11:33:31 -05:00

openvas

…

postgres

…

rabal

…

rapid7

Rapid7 Comma Inc

2014-03-13 09:46:20 -05:00

rbmysql

…

rex

Various merge resolutions from master <- staging

2014-08-15 11:33:31 -05:00

snmp

…

sqlmap

Moar " -> '

2014-07-21 18:04:36 -05:00

sshkey

Fix improper use of host-endian or signed pack/unpack

2014-06-30 02:50:10 -05:00

tasks

Various merge resolutions from master <- staging

2014-08-15 11:33:31 -05:00

telephony

…

anemone.rb

…

bit-struct.rb

…

enumerable.rb

…

fastlib.rb

Various merge resolutions from master <- staging

2014-08-15 11:33:31 -05:00

metasm.rb

Manual loading shouldn't be needed

2014-02-19 13:13:41 -06:00

msfenv.rb

Various merge resolutions from master <- staging

2014-08-15 11:33:31 -05:00

postgres_msf.rb

…

rbmysql.rb

…

rbreadline.rb

…

readline_compatible.rb

…

rex.rb

Rapid7 Comma Inc

2014-03-13 09:46:20 -05:00

snmp.rb

…

sshkey.rb

…

telephony.rb

…

windows_console_color_support.rb

Fix improper use of host-endian or signed pack/unpack

2014-06-30 02:50:10 -05:00