The command used was:
svn merge -r14033:r14026 gui/analyses/execute.py
.....
r14033 | bugman | 2011-08-01 15:26:35 +0200 (Mon, 01 Aug 2011) | 3 lines
Changed paths:
M /branches/gui_testing/gui/analyses/execute.py
The opening of the results viewer window after an analysis is now thread safe!
.....
r14027 | bugman | 2011-08-01 11:12:04 +0200 (Mon, 01 Aug 2011) | 3 lines
Changed paths:
M /branches/gui_testing/gui/analyses/execute.py
The results display window is now shown at the end of the auto-analysis execution.
.....
