History

merge from upstream

Seth Alves committed 11 years ago

Commit cdc26522 parents abfe60a e63d122291 files · +6007 −10064Browse files

Showing the changes to libraries/render-utils/src/Model.cpp (1 of 291 files). Show all

Unified · Split

libraries/render-utils/src/Model.cpp+0−2
@@ -9,8 +9,6 @@ · 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 <gpu/GPUConfig.h>
13
14#include <QMetaType>12#include <QMetaType>
15#include <QRunnable>13#include <QRunnable>
16#include <QThreadPool>14#include <QThreadPool>