The command used was:
svn merge -r23000:r22999 .
.....
Merge branch 'bug' into m2
Added:
trunk/test_suite/shared_data/dispersion/Baldwin_2014/Baldwin_r2a_eq_r2b.py
trunk/test_suite/shared_data/dispersion/Baldwin_2014/test_r2a_eq_r2b.out
trunk/test_suite/shared_data/dispersion/Baldwin_2014/test_r2a_eq_r2b_w_error.out
Modified:
trunk/docs/latex/bibliography.bib
trunk/docs/latex/dispersion.tex
trunk/gui/analyses/auto_relax_disp.py
trunk/lib/dispersion/b14.py
trunk/specific_analyses/relax_disp/variables.py
trunk/target_functions/relax_disp.py
trunk/test_suite/system_tests/relax_disp.py
trunk/user_functions/relax_disp.py
[This mail would be too long, it was shortened to contain the URLs only.]
.....