summaryrefslogtreecommitdiff
path: root/headers.h
diff options
context:
space:
mode:
authorSergey (Elzor) Bolhovskoy <elzor@foobar2000.ru>2010-08-18 01:22:41 +0600
committerSergey (Elzor) Bolhovskoy <elzor@foobar2000.ru>2010-08-18 01:22:41 +0600
commit21be46f3aecb857c5875dc8c503e543c852cd982 (patch)
tree905e2b993fc3540c4eb3e9443bf541dd9973e1b2 /headers.h
parent2fa28d16322fb74b745511e99e034b21eacd442c (diff)
parentfed38de9fdbec88cc3e1b5e3b536a8d7124a7fbc (diff)
Merge branch 'stopspam_mod' of ssh://sss.chaoslab.ru/home/git/mim_plugs into stopspam_mod
Conflicts: utilities.cpp
Diffstat (limited to 'headers.h')
-rw-r--r--headers.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/headers.h b/headers.h
index e762a14..679c6fc 100644
--- a/headers.h
+++ b/headers.h
@@ -7,7 +7,7 @@
#include <sstream>
#include<fstream>
-//#include <boost/scoped_array.hpp>
+
#include <newpluginapi.h>
#include <m_database.h>
#include <m_protosvc.h>
@@ -18,7 +18,7 @@
#include <m_skin.h>
#include <m_button.h>
#include <m_contacts.h>
-//#define VARIABLES_NOHELPER
+
#include <m_variables.h>
#include <m_folders.h>