diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-02-19 15:49:45 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-02-19 15:49:45 +0300 |
| commit | b30a5d2289a0b68410dee5343e148aba88ea4839 (patch) | |
| tree | 9d756785b9166ced76675ad3ebe398c09b494a3c /src/net/tmwa/gui | |
| parent | 9a3a196dbf633a699c26d0227802a42f025c8bfd (diff) | |
| parent | 164e4ed5a153ce06badb52f3a5a4dff16c58d7e6 (diff) | |
| download | plus-b30a5d2289a0b68410dee5343e148aba88ea4839.tar.gz plus-b30a5d2289a0b68410dee5343e148aba88ea4839.tar.bz2 plus-b30a5d2289a0b68410dee5343e148aba88ea4839.tar.xz plus-b30a5d2289a0b68410dee5343e148aba88ea4839.zip | |
Merge branch 'master' into stripped
Diffstat (limited to 'src/net/tmwa/gui')
| -rw-r--r-- | src/net/tmwa/gui/guildtab.cpp | 1 | ||||
| -rw-r--r-- | src/net/tmwa/gui/partytab.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/net/tmwa/gui/guildtab.cpp b/src/net/tmwa/gui/guildtab.cpp index af90f5c6b..496ba64f5 100644 --- a/src/net/tmwa/gui/guildtab.cpp +++ b/src/net/tmwa/gui/guildtab.cpp @@ -53,4 +53,3 @@ GuildTab::~GuildTab() } } // namespace TmwAthena - diff --git a/src/net/tmwa/gui/partytab.cpp b/src/net/tmwa/gui/partytab.cpp index d0738e79c..02bcfd54f 100644 --- a/src/net/tmwa/gui/partytab.cpp +++ b/src/net/tmwa/gui/partytab.cpp @@ -56,4 +56,3 @@ PartyTab::~PartyTab() } } // namespace TmwAthena - |