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
..
ntp_monlist.rb	msftidy: remove $Revision$	2013-01-03 00:58:09 +01:00
ntp_readvar.rb	Reverting disaster merge to 593363c5f with diff	2013-07-29 21:47:52 -05:00