diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:22:50 +0100 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:22:50 +0100 |
| commit | a1e61f8446b7928d854a062f6494e75fe3fec9ab (patch) | |
| tree | 953cba5593a49f818612f38de1149a2763a36aa8 /src/resources/userpalette.h | |
| parent | 79cb8fa1ca81440e21bcb186785d47c50a608e8e (diff) | |
| parent | 8954a7ca0f70bbf167c9119d26c7bca8407e8da6 (diff) | |
| download | Mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.gz Mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.bz2 Mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.xz Mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.zip | |
Merge github.com:mana/mana
Conflicts:
src/localplayer.cpp
src/net/manaserv/beinghandler.cpp
src/net/manaserv/charhandler.cpp
Diffstat (limited to 'src/resources/userpalette.h')
| -rw-r--r-- | src/resources/userpalette.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/resources/userpalette.h b/src/resources/userpalette.h index 01f66ca7..1dd5cf6a 100644 --- a/src/resources/userpalette.h +++ b/src/resources/userpalette.h @@ -114,8 +114,6 @@ class UserPalette : public Palette, public gcn::ListModel /** * Sets the gradient delay for the specified color. - * - * @param grad gradient type to set */ void setGradientDelay(int type, int delay) { mColors[type].delay = delay; } @@ -191,7 +189,6 @@ class UserPalette : public Palette, public gcn::ListModel /** * Initialise color * - * @param c character that needs initialising * @param rgb default color if not found in config * @param text identifier of color */ |