diff options
| author | Sergey (Elzor) Bolhovskoy <elzor@foobar2000.ru> | 2010-08-18 01:22:41 +0600 |
|---|---|---|
| committer | Sergey (Elzor) Bolhovskoy <elzor@foobar2000.ru> | 2010-08-18 01:22:41 +0600 |
| commit | 21be46f3aecb857c5875dc8c503e543c852cd982 (patch) | |
| tree | 905e2b993fc3540c4eb3e9443bf541dd9973e1b2 /headers.h | |
| parent | 2fa28d16322fb74b745511e99e034b21eacd442c (diff) | |
| parent | fed38de9fdbec88cc3e1b5e3b536a8d7124a7fbc (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.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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> |