diff options
| author | Reid <reidyaro@gmail.com> | 2012-01-25 22:05:36 +0100 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2012-01-25 22:05:36 +0100 |
| commit | 8b612abb42853a22c1a9545e2c9280d154646543 (patch) | |
| tree | f466167087c2b2de4b8aa9e6d1d1986f72f84147 /src/gui/inventorywindow.cpp | |
| parent | a913dd41df61760de6ece552f941e002251ff54c (diff) | |
| parent | d340b5a27a8f3b05d1764da9c114f5f59bd0cd46 (diff) | |
| download | manaverse-8b612abb42853a22c1a9545e2c9280d154646543.tar.gz manaverse-8b612abb42853a22c1a9545e2c9280d154646543.tar.bz2 manaverse-8b612abb42853a22c1a9545e2c9280d154646543.tar.xz manaverse-8b612abb42853a22c1a9545e2c9280d154646543.zip | |
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/gui/inventorywindow.cpp')
| -rw-r--r-- | src/gui/inventorywindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index 8ffebebff..01e2bdd17 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -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. * @@ -98,7 +98,7 @@ InventoryWindow::WindowList InventoryWindow::instances; InventoryWindow::InventoryWindow(Inventory *inventory): Window("Inventory", false, nullptr, "inventory.xml"), mInventory(inventory), - mDropButton(0), + mDropButton(nullptr), mSplit(false), mCompactMode(false) { |