Merge remote-tracking branch 'upstream/develop' into mg

This commit is contained in:
Adam Nelson 2016-02-19 20:44:46 -05:00
commit 0ea1ee2b88
10 changed files with 19 additions and 15 deletions

View file

@ -340,10 +340,10 @@ out the file and "false" will not.
*Default*: false
:summary:
Writes out an ASCII summary file describing all of the user input files that
Writes out an HDF5 summary file describing all of the user input files that
were read in.
*Default*: false
*Default*: true
:tallies:
Write out an ASCII file of tally results.