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/gui/quitdialog.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/gui/quitdialog.h')
| -rw-r--r-- | src/gui/quitdialog.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/quitdialog.h b/src/gui/quitdialog.h index 21fe2f8a..1571c7d1 100644 --- a/src/gui/quitdialog.h +++ b/src/gui/quitdialog.h @@ -41,9 +41,9 @@ class QuitDialog : public Window, public gcn::ActionListener, { public: /** - * Constructor + * Constructor. * - * @pointerToMe will be set to NULL when the QuitDialog is destroyed + * @param pointerToMe will be set to NULL when the QuitDialog is destroyed */ QuitDialog(QuitDialog **pointerToMe); |