Skip to content
GitLab
Commit dad0989f authored by John Harwell's avatar John Harwell
Browse files

Finished merging with latest 'master'. For some reason, a couple of... 

Finished merging with latest 'master'.  For some reason, a couple of conversions from CaretColorEnum::toRGBFloat() to CaretColorEnum::toRGBAFloat() got lost during the merge.
parent a1a208cc
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment