Permalink
Browse files

Merge branch 'master' of github.com:kipr/computer

  • Loading branch information...
bmcdorman committed Oct 14, 2013
2 parents 13d9258 + 8f7a08b commit be1c6e97ba6c30a454b44d80332afb9a53a1553d
Showing with 2 additions and 0 deletions.
  1. +1 −0 src/quser_info.cpp
  2. +1 −0 src/server_thread.cpp
View
@@ -1,6 +1,7 @@
#include "quser_info.hpp"
#ifdef Q_OS_WIN
+#define NOMINMAX
#include <windows.h>
#else
#include <unistd.h>
View
@@ -17,6 +17,7 @@
#include <QDir>
#ifdef Q_OS_WIN
+#define NOMINMAX
#include <windows.h>
#endif

0 comments on commit be1c6e9

Please sign in to comment.