The command used was:
svn merge -r24312:r24311 .
.....
r24312 | bugman | 2014-06-25 10:27:03 +0200 (Wed, 25 Jun 2014) | 6 lines
Changed paths:
M /branches/frame_order_cleanup/target_functions/frame_order.py
The pivot to atom vectors, and the reverse vectors, are no longer set up in the __init__() method.
This is for the frame order target functions. The structures are generated in the calc_vectors()
method via a dot product, and hence do not need to be initialised.
.....
