summaryrefslogtreecommitdiff
path: root/src/gui/textdialog.h
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2012-01-25 22:05:36 +0100
committerReid <reidyaro@gmail.com>2012-01-25 22:05:36 +0100
commit8b612abb42853a22c1a9545e2c9280d154646543 (patch)
treef466167087c2b2de4b8aa9e6d1d1986f72f84147 /src/gui/textdialog.h
parenta913dd41df61760de6ece552f941e002251ff54c (diff)
parentd340b5a27a8f3b05d1764da9c114f5f59bd0cd46 (diff)
downloadmanaplus-8b612abb42853a22c1a9545e2c9280d154646543.tar.gz
manaplus-8b612abb42853a22c1a9545e2c9280d154646543.tar.bz2
manaplus-8b612abb42853a22c1a9545e2c9280d154646543.tar.xz
manaplus-8b612abb42853a22c1a9545e2c9280d154646543.zip
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/gui/textdialog.h')
-rw-r--r--src/gui/textdialog.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/textdialog.h b/src/gui/textdialog.h
index aed26c1e9..03deae8f6 100644
--- a/src/gui/textdialog.h
+++ b/src/gui/textdialog.h
@@ -2,7 +2,7 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011 The ManaPlus Developers
+ * Copyright (C) 2011-2012 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -44,7 +44,7 @@ public:
* @see Window::Window
*/
TextDialog(const std::string &title, const std::string &msg,
- Window *parent = 0, bool isPassword = false);
+ Window *parent = nullptr, bool isPassword = false);
~TextDialog();