12 lines
464 B
Diff
12 lines
464 B
Diff
|
--- rosegarden-4-1.0.orig/base/Colour.C 2005-11-09 14:49:19.000000000 +0100
|
||
|
|
+++ rosegarden-4-1.0/base/Colour.C 2005-11-09 14:51:03.000000000 +0100
|
||
|
|
@@ -163,7 +163,7 @@
|
||
|
|
// Generic Colour routines:
|
||
|
|
|
||
|
|
Colour
|
||
|
|
-Rosegarden::getCombinationColour(const Colour &input1, const Colour &input2)
|
||
|
|
+getCombinationColour(const Colour &input1, const Colour &input2)
|
||
|
|
{
|
||
|
|
Colour ret((input1.getRed()+input2.getRed())/2,
|
||
|
|
(input1.getGreen()+input2.getGreen())/2,
|