diff options
| author | Bertram <bertram@cegetel.net> | 2010-03-03 23:36:37 +0100 |
|---|---|---|
| committer | Bertram <bertram@cegetel.net> | 2010-03-03 23:36:37 +0100 |
| commit | 8cc31b582f372238ce6bd2c86888d312cf1fe5b2 (patch) | |
| tree | 8db5f864348d08a05b8533c7ede58e76741a98f8 /src/gui/beingpopup.cpp | |
| parent | b1845e9e081df1fc77d9bcbed3ab95792d6ba682 (diff) | |
| parent | d564943867452ad76e6d313a28870e640715dded (diff) | |
| download | mana-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.tar.gz mana-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.tar.bz2 mana-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.tar.xz mana-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.zip | |
Merge branch 'master' of gitorious.org:mana/mana
Conflicts:
src/being.cpp
Diffstat (limited to 'src/gui/beingpopup.cpp')
| -rw-r--r-- | src/gui/beingpopup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/beingpopup.cpp b/src/gui/beingpopup.cpp index 3d60589f..7fd99371 100644 --- a/src/gui/beingpopup.cpp +++ b/src/gui/beingpopup.cpp @@ -38,14 +38,14 @@ BeingPopup::BeingPopup(): Popup("BeingPopup") { - // Item Name + // Being Name mBeingName = new TextBox(); mBeingName->setFont(boldFont); mBeingName->setPosition(getPadding(), getPadding()); const int fontHeight = getFont()->getHeight(); - // Item Description + // Being's party mBeingParty = new TextBox(); mBeingParty->setPosition(getPadding(), fontHeight); |