Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:47:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'assignment' into domain-web-server

Browse source
This commit is contained in:
Stephen Birarda 2013-09-11 14:49:28 -07:00
commit 3dd0b40776
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-server/src/main.cpp
View file

@ -8,7 +8,7 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <fstream> #include <fstream>
#include <queue> #include <dequeg>
#include <QtCore/QString> #include <QtCore/QString>

2
domain-server/src/main.cpp
View file

@ -19,7 +19,7 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <fcntl.h> #include <fcntl.h>
#include <queue.h> #include <deque>
#include <map> #include <map>
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>