summaryrefslogtreecommitdiff
path: root/src/gui/widgets/dropdown.h
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-11-01 04:22:50 +0100
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-11-01 04:22:50 +0100
commita1e61f8446b7928d854a062f6494e75fe3fec9ab (patch)
tree953cba5593a49f818612f38de1149a2763a36aa8 /src/gui/widgets/dropdown.h
parent79cb8fa1ca81440e21bcb186785d47c50a608e8e (diff)
parent8954a7ca0f70bbf167c9119d26c7bca8407e8da6 (diff)
downloadmana-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/gui/widgets/dropdown.h')
-rw-r--r--src/gui/widgets/dropdown.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index e0cfd0d7..c7b3cdb1 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -41,9 +41,7 @@ class DropDown : public gcn::DropDown
* Contructor.
*
* @param listModel the ListModel to use.
- * @param scrollArea the ScrollArea to use.
- * @param listBox the listBox to use.
- * @see ListModel, ScrollArea, ListBox.
+ * @see ListModel
*/
DropDown(gcn::ListModel *listModel = 0);