merge from master

This commit is contained in:
Paul Davis 2013-10-22 15:29:44 -04:00
commit 664e715a00
54 changed files with 1106 additions and 371 deletions

View file

@ -450,7 +450,7 @@ struct EditorOrderTimeAxisViewSorter {
RouteTimeAxisView* ra = dynamic_cast<RouteTimeAxisView*> (a);
RouteTimeAxisView* rb = dynamic_cast<RouteTimeAxisView*> (b);
assert (ra && rb);
return ra->route()->order_key (EditorSort) < rb->route()->order_key (EditorSort);
return ra->route()->order_key () < rb->route()->order_key ();
}
};