From d6633a73369339c419f33fb9d641f342826a3290 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 27 Dec 2014 20:35:19 +0000 Subject: Rename color -> colour. --- tools/dcpinfo.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc index 0bf0df08..1ebc4d95 100644 --- a/tools/dcpinfo.cc +++ b/tools/dcpinfo.cc @@ -87,13 +87,13 @@ main_subtitle (shared_ptr reel, bool list_subtitles) cout << " " << "font:" << k->font().get_value_or("[default]") << "; " << "italic:" << k->italic() << "; " - << "color:" << k->color() << "; " + << "color:" << k->colour() << "; " << "in:" << k->in() << "; " << "out:" << k->out() << "; " << "v_position:" << k->v_position() << "; " << "v_align:" << k->v_align() << "; " << "effect:" << k->effect() << "; " - << "effect_color:" << k->effect_color() << "; " + << "effect_color:" << k->effect_colour() << "; " << "fade_up_time:" << k->fade_up_time() << "; " << "fade_down_time:" << k->fade_down_time() << "; " << "size: " << k->size() << "\n"; -- cgit v1.2.3