Beautifying master.
This is a large commit and will undoubtedly produce conflicts with everyone
seeking to merge into master.
The merge process for advancing past this commit is as follows:
> git pull && git checkout 3f02864
> git merge 6d44fcf00
dismiss them
cd into Rosetta/main/source
run the python beautifier script:
> python ../../tools/python_cc_reader/beautify_rosetta.py -j 40 --overwrite
(or leave off the --overwrite flag to write the beautified X.cc file to X.cc.beaut,
if you'd first like to see what the beautifier does)
The -j flag tells the script how many processors to use. It takes about 5 minutes.
SHA-1 in this commit log message because this commit log message goes into determining
the SHA-1!) using the -Xours flag:
> git merge -Xours <thissha1>
and must be carefully handled.