ardour/livetrax
13
0
Fork 0
Code

fix issue with manual merge conflict

Browse Source
This commit is contained in:
Paul Davis 2015-04-29 08:23:13 -04:00
parent 2828dcaaf9
commit 80ae2bbe23
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/canvas/canvas/text.h
View File

@ -65,7 +65,6 @@ private:
mutable bool _need_redraw;
mutable double _width_correction;
double _clamped_width;
double _width_correction;
void _redraw (Cairo::RefPtr<Cairo::Context>) const;
void _redraw (Glib::RefPtr<Pango::Context>) const;