diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-09 14:00:42 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-09 14:00:42 -0400 |
| commit | 2a6a16f980ff9181b138f7a30aedfbde4426a591 (patch) | |
| tree | d86752508bbd033be18301796e7d0c571a4fe1c0 /gtk2_ardour/utils.h | |
| parent | 66aa6dfc8ecdb7591768bc45866a8c2b0d77e767 (diff) | |
| parent | 465b800d8b7dc0d9e0f92a16c6fcae29d2bbd544 (diff) | |
merge with master, fixing conflicts in 3 wscript files
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 5d7bf000ea..a1a54898b5 100644 --- a/gtk2_ardour/utils.h +++ b/gtk2_ardour/utils.h @@ -86,4 +86,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__ */ |