Merge branch 'miami' into lcs
# Conflicts: # src/control/Script.h # src/modelinfo/SimpleModelInfo.cpp # src/modelinfo/VehicleModelInfo.cpp # src/rw/VisibilityPlugins.cpp # src/rw/VisibilityPlugins.h
This commit is contained in:
@@ -1,3 +1,5 @@
|
||||
#include "common.h"
|
||||
|
||||
#ifdef AUDIO_MSS
|
||||
#include <shlobj.h>
|
||||
#include <shlguid.h>
|
||||
@@ -8,7 +10,6 @@
|
||||
#include "eax-util.h"
|
||||
#include "mss.h"
|
||||
|
||||
#include "common.h"
|
||||
#include "sampman.h"
|
||||
#include "AudioManager.h"
|
||||
#include "MusicManager.h"
|
||||
|
||||
Reference in New Issue
Block a user