HD Moore a844b5c30a Merge branch 'master' of github.com:hmoore-r7/metasploit-framework into feature/recog ...

Conflicts:
	Gemfile
	Gemfile.lock
	data/js/detect/os.js
	lib/msf/core/exploit/remote/browser_exploit_server.rb

2014-05-18 10:50:32 -05:00

..

detect.rb

Rework OS fingerprinting to match Recog changes

2014-04-01 08:14:58 -07:00

memory.rb

Use ObfuscateJS

2014-03-28 11:08:38 -05:00

network.rb

Start undoing some work.

2014-03-04 17:01:53 -06:00

utils.rb

Apparently I missed a lot of stuff

2013-10-21 21:02:01 -05:00