Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 04:44:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Missed a spot in the merge.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-08-15 10:10:14 -07:00
parent 3ad0b8b99d
commit 94e5c8d4a1
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/Application.h
View file

@ -32,6 +32,7 @@
#include "Environment.h"
#include "PacketHeaders.h"
#include "ParticleSystem.h"
#include "PieMenu.h"
#include "SerialInterface.h"
#include "Stars.h"
#include "Swatch.h"
@ -40,13 +41,9 @@
#include "VoxelFade.h"
#include "VoxelSystem.h"
#include "Webcam.h"
<<<<<<< HEAD
#include "renderer/AmbientOcclusionEffect.h"
=======
#include "PieMenu.h"
#include "avatar/Avatar.h"
#include "avatar/HandControl.h"
>>>>>>> 8238d0d380944c07a14c5fd42efa1a5d3eb468ed
#include "renderer/AmbientOcclusionEffect.h"
#include "renderer/GeometryCache.h"
#include "renderer/GlowEffect.h"
#include "renderer/TextureCache.h"