The command used was:
svn merge -r24332:r24331 .
.....
r24332 | bugman | 2014-06-26 16:29:46 +0200 (Thu, 26 Jun 2014) | 6 lines
Changed paths:
M /branches/frame_order_cleanup/lib/frame_order/double_rotor.py
Fix for the double rotor frame order matrix assembly function.
The rotations where applied in reverse, hence the 2nd degree frame order matrix was the Kronecker
product transpose of the correct form.
.....