The command used was:
svn merge -r20681:r20680 .
.....
r20681 | bugman | 2013-08-23 16:59:16 +0200 (Fri, 23 Aug 2013) | 6 lines
Changed paths:
M /branches/relax_disp/target_functions/relax_disp.py
Changed how chemical shifts are handled in the dispersion target function class.
The chemical shifts in ppm are accepted and they are converted to rad/s inside the __init__()
method. A structure for rotating frame tilt angles is now also accepted.
.....