History

Merge branch 'master' of https://github.com/highfidelity/hifi into android

Atlante45 committed 11 years ago

Commit 4ef87b92 parents df96e02 347c74e113 files · +3501 −2168Browse files

Showing the changes to assignment-client/src/AssignmentClient.cpp (1 of 113 files). Show all

Unified · Split

assignment-client/src/AssignmentClient.cpp+5−4
@@ -9,10 +9,11 @@ · 8 unmodified lines
9// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html9// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
10//10//
11 11
12#include <QtCore/QProcess>12#include <QProcess>
13#include <QtCore/qsharedmemory.h>13#include <QSettings>
14#include <QtCore/QThread>14#include <QSharedMemory>
15#include <QtCore/QTimer>15#include <QThread>
16#include <QTimer>
16 17
17#include <AccountManager.h>18#include <AccountManager.h>
18#include <AddressManager.h>19#include <AddressManager.h>