Tod Beardsley 7e539332db Reverting disaster merge to 593363c5f with diff ... There was a disaster of a merge at 6f37cf22eb that is particularly difficult to untangle (it was a bad merge from a long-running local branch). What this commit does is simulate a hard reset, by doing thing: git checkout -b reset-hard-ohmu git reset --hard 593363c5f9 git checkout upstream-master git checkout -b revert-via-diff git diff --no-prefix upstream-master..reset-hard-ohmy > patch patch -p0 < patch Since there was one binary change, also did this: git checkout upstream-master data/exploits/CVE-2012-1535/Main.swf Now we have one commit that puts everything back. It screws up file-level history a little, but it's at least at a point where we can move on with our lives. Sorry.		2013-07-29 21:47:52 -05:00
..
meterpreter	Reverting disaster merge to 593363c5f with diff	2013-07-29 21:47:52 -05:00
dir.rb	Whitespace at EOL	2013-03-07 18:16:57 -06:00
file.rb	Mark all libraries as defaulting to 8-bit strings	2012-06-29 00:18:28 -05:00
file_stat.rb	Whitespace at EOL	2013-03-07 18:16:57 -06:00
gen.pl	Reverting the autoload changes until we can upgrade to a new ActiveSupport library or find a workaround	2011-05-12 20:03:55 +00:00
io.rb	Whitespace at EOL	2013-03-07 18:16:57 -06:00
meterpreter.rb	Mark all libraries as defaulting to 8-bit strings	2012-06-29 00:18:28 -05:00
permission.rb	Mark all libraries as defaulting to 8-bit strings	2012-06-29 00:18:28 -05:00
process.rb	Mark all libraries as defaulting to 8-bit strings	2012-06-29 00:18:28 -05:00
thread.rb	Mark all libraries as defaulting to 8-bit strings	2012-06-29 00:18:28 -05:00
ui.rb	Mark all libraries as defaulting to 8-bit strings	2012-06-29 00:18:28 -05:00