diff options
| author | Florian Jung <flo@windfisch.org> | 2011-12-21 17:39:57 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-12-21 17:39:57 +0000 |
| commit | 1057d7190242cdf9248671b316a398db805f5f56 (patch) | |
| tree | ab50268a7db2f80cfb45a7ad6578fe735ab84ce5 /muse2/muse/functions.h | |
| parent | 9977c7114089b8708d310268833b83343caa0fd1 (diff) | |
| parent | c36a5508aa42e596b005425208054af9a60734b4 (diff) | |
merged with trunk (that is, pulled the fixes from release_2_0)
only quickly tested, seems okay on the first glance
Diffstat (limited to 'muse2/muse/functions.h')
| -rw-r--r-- | muse2/muse/functions.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/muse2/muse/functions.h b/muse2/muse/functions.h index 2cf9c245..c81dd2bc 100644 --- a/muse2/muse/functions.h +++ b/muse2/muse/functions.h @@ -102,6 +102,8 @@ void shrink_parts(int raster=-1); //negative values mean "config.division" void expand_parts(int raster=-1); void schedule_resize_all_same_len_clone_parts(Part* part, unsigned new_len, Undo& operations); void clean_parts(); +bool merge_selected_parts(); +bool merge_parts(const std::set<Part*>& parts); } // namespace MusECore |