Merge branch 'master' into root6

This commit is contained in:
2016-12-22 17:05:36 +01:00
5 changed files with 4 additions and 19 deletions

View File

@@ -15,6 +15,7 @@
<chisq_per_run_block>n</chisq_per_run_block>
<estimate_n0>y</estimate_n0>
<musrview_show_fourier>n</musrview_show_fourier>
<musrview_show_avg>n</musrview_show_avg>
<enable_musrt0>y</enable_musrt0>
</general>
<recent_files>