diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-16 22:06:56 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-16 22:06:56 -0400 |
commit | e5888d398350b26ba2cdc634cc9791e90b4fc6b6 (patch) | |
tree | 54f485ea56d034ecba01938fbc680b12884fc136 /gtk2_ardour/utils.h | |
parent | 18850253e9f0034fad132e0da07a2651ce041450 (diff) | |
parent | da5a49067839ec32a016bf1b66c3808ad7cbf699 (diff) |
merge with master and fix 2 conflicts
Diffstat (limited to 'gtk2_ardour/utils.h')
-rw-r--r-- | gtk2_ardour/utils.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gtk2_ardour/utils.h b/gtk2_ardour/utils.h index 54ef65acd0..30ccd9c43d 100644 --- a/gtk2_ardour/utils.h +++ b/gtk2_ardour/utils.h @@ -89,4 +89,6 @@ std::string escape_angled_brackets (std::string const &); Gdk::Color unique_random_color (std::list<Gdk::Color> &); +std::string rate_as_string (float r); + #endif /* __ardour_gtk_utils_h__ */ |