summaryrefslogtreecommitdiff
path: root/src/net/adminhandler.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-10-17 22:07:24 +0300
committerAndrei Karas <akaras@inbox.ru>2011-10-17 22:07:24 +0300
commitd14bb7a27ee23cc83b3af1db2f1976eaaa55d78a (patch)
tree5f128768c66436eefd70632f02889607596609d4 /src/net/adminhandler.h
parentf1e92aca00a4859047e83fab76220767b9a2f814 (diff)
parente93e6beb456d105987da3190c2a80847b6900081 (diff)
downloadplus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.gz
plus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.bz2
plus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.xz
plus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.zip
Merge branch 'master' into strippedstripped1.1.10.16
Conflicts: data/fonts/mplus-1p-bold.ttf data/fonts/mplus-1p-regular.ttf
Diffstat (limited to 'src/net/adminhandler.h')
-rw-r--r--src/net/adminhandler.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/net/adminhandler.h b/src/net/adminhandler.h
index d063c4eb1..6899f85f4 100644
--- a/src/net/adminhandler.h
+++ b/src/net/adminhandler.h
@@ -31,7 +31,8 @@ namespace Net
class AdminHandler
{
public:
- virtual ~AdminHandler() {}
+ virtual ~AdminHandler()
+ { }
virtual void announce(const std::string &text) = 0;