summaryrefslogtreecommitdiff
path: root/src/net/ea/gui/partytab.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-03-01 19:13:11 +0300
committerAndrei Karas <akaras@inbox.ru>2014-03-01 19:13:11 +0300
commita260aeab234704ace8ba672b1d1ce57e18425e07 (patch)
treee215c6eeeae7e6c2ca4f4453718cef6ca9a8af6a /src/net/ea/gui/partytab.h
parent382067b05c4fe97bcf0da0143405375ec295f7c6 (diff)
parent2c62286a7ecf246e8a445dd7d00f618efae2a96a (diff)
downloadplus-a260aeab234704ace8ba672b1d1ce57e18425e07.tar.gz
plus-a260aeab234704ace8ba672b1d1ce57e18425e07.tar.bz2
plus-a260aeab234704ace8ba672b1d1ce57e18425e07.tar.xz
plus-a260aeab234704ace8ba672b1d1ce57e18425e07.zip
Merge branch 'master' into stable
Diffstat (limited to 'src/net/ea/gui/partytab.h')
-rw-r--r--src/net/ea/gui/partytab.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/net/ea/gui/partytab.h b/src/net/ea/gui/partytab.h
index d141452d0..6c61990dd 100644
--- a/src/net/ea/gui/partytab.h
+++ b/src/net/ea/gui/partytab.h
@@ -31,7 +31,8 @@ namespace Ea
/**
* A tab for a party chat channel.
*/
-class PartyTab : public ChatTab, public ConfigListener
+class PartyTab : public ChatTab,
+ public ConfigListener
{
public:
explicit PartyTab(const Widget2 *const widget);