The commands used were:
svn merge -r17252:17253 svn+ssh://bugman@.../svn/relax/branches/relax_disp/specific_fns/@r18123 specific_analyses
svn merge -r17252:17253 svn+ssh://bugman@.../svn/relax/branches/relax_disp/test_suite/@r18123 test_suite
.....
r17253 | bugman | 2012-07-12 20:01:38 +0200 (Thu, 12 Jul 2012) | 3 lines
Changed paths:
M /branches/relax_disp/maths_fns/dispersion.c
M /branches/relax_disp/maths_fns/dispersion.h
M /branches/relax_disp/maths_fns/relax_disp.c
M /branches/relax_disp/maths_fns/relax_disp.h
M /branches/relax_disp/prompt/relax_disp.py
M /branches/relax_disp/specific_fns/relax_disp.py
M /branches/relax_disp/test_suite/system_tests/relax_disp.py
M /branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py
GPLv3 license updates for all files not found in the trunk.
.....
