diff options
| author | Gluzskiy Alexandr <sss123next@list.ru> | 2011-03-17 22:11:24 +0200 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss123next@list.ru> | 2011-03-17 22:11:24 +0200 |
| commit | be35d4a3d07f44604ad71e6c6997c47f8b5bcdde (patch) | |
| tree | 7e89c8fc32c2d95ddda18230deca7896f1f5d1e7 /commonheaders.h | |
| parent | 4d6851c77b1d02968e83e60b1dfbed28cd729408 (diff) | |
| parent | d116d404808e9ae9a7860c1eecf0b5974b91c994 (diff) | |
Merge branch 'new_gpg' into new_gpg_autoexchange
Conflicts:
main.cpp
Diffstat (limited to 'commonheaders.h')
| -rw-r--r-- | commonheaders.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/commonheaders.h b/commonheaders.h index 990497b..1b7d8f1 100644 --- a/commonheaders.h +++ b/commonheaders.h @@ -44,10 +44,10 @@ using std::fstream; //boost #include <boost/thread/thread.hpp> #include <boost/thread/mutex.hpp> -#include <boost/nondet_random.hpp>
-#include <boost/random/variate_generator.hpp>
-#include <boost/random/uniform_int.hpp>
-#include <boost/date_time.hpp>
+#include <boost/nondet_random.hpp> +#include <boost/random/variate_generator.hpp> +#include <boost/random/uniform_int.hpp> +#include <boost/date_time.hpp> //utf8cpp |