The command used was:
svn merge -r14221:14220 .
.....
r14221 | bugman | 2011-08-06 21:59:57 +0200 (Sat, 06 Aug 2011) | 3 lines
Changed paths:
M /branches/gui_testing/gui/analyses/auto_model_free.py
M /branches/gui_testing/gui/analyses/auto_noe.py
M /branches/gui_testing/gui/analyses/auto_rx_base.py
M /branches/gui_testing/gui/analyses/base.py
The add_spin_systems() base class method now returns the Text_ctrl instance it creates.
.....