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

@ -5520,7 +5520,7 @@ Editor::split_region ()
struct EditorOrderRouteSorter {
bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
return a->order_key (EditorSort) < b->order_key (EditorSort);
return a->order_key () < b->order_key ();
}
};