diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-05-21 21:56:41 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-05-21 21:56:41 +0200 |
| commit | 63b4c9869b6256ed7644113cd23305b07cf9df03 (patch) | |
| tree | aff0d99f5b58cbaf4195ac755ecfb79f97bf7b65 /src/gui/statuswindow.cpp | |
| parent | 8c4c5a58c256cce7beb21b68c8a7d6b6ff5c4a3a (diff) | |
| parent | 2953a3f92c5097bd99ff21f4536fe167a32d90c5 (diff) | |
| download | mana-client-63b4c9869b6256ed7644113cd23305b07cf9df03.tar.gz mana-client-63b4c9869b6256ed7644113cd23305b07cf9df03.tar.bz2 mana-client-63b4c9869b6256ed7644113cd23305b07cf9df03.tar.xz mana-client-63b4c9869b6256ed7644113cd23305b07cf9df03.zip | |
Merge branch '1.0'
Conflicts:
src/beingmanager.cpp
src/beingmanager.h
src/client.cpp
src/localplayer.cpp
Diffstat (limited to 'src/gui/statuswindow.cpp')
| -rw-r--r-- | src/gui/statuswindow.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp index 498a4523..2439a213 100644 --- a/src/gui/statuswindow.cpp +++ b/src/gui/statuswindow.cpp @@ -283,7 +283,8 @@ void StatusWindow::setPointsNeeded(int id, int needed) } void StatusWindow::addAttribute(int id, const std::string &name, - bool modifiable) + bool modifiable, + const std::string &description) { AttrDisplay *disp; |