Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 720 vs 721 for /trunk/Source Code/GUI/GUIText.cpp

Diff revisions: vs.
  @@ -6,11 +6,11 @@
6 6 const stringImpl& text,
7 7 const vec2<F32>& relativePosition,
8 8 const stringImpl& font,
9 - const vec3<F32>& color,
9 + const vec3<F32>& colour,
10 10 CEGUI::Window* parent,
11 11 U32 fontSize)
12 12 : GUIElement(ID, parent, GUIType::GUI_TEXT),
13 - TextLabel(text, font, color, fontSize),
13 + TextLabel(text, font, colour, fontSize),
14 14 _position(relativePosition),
15 15 _heightCache(0.0f)
16 16 {