mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-10 02:16:31 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source

Browse Source 
Conflicts:
	source/shared_lib/include/platform/sdl/factory_repository.h
This commit is contained in:
SoftCoder
2013-12-14 02:45:25 -08:00
parent 65e55d3796 ec13e904d3
commit d69e19b87b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/shared_lib/include/platform/sdl/factory_repository.h
View File

@@ -14,8 +14,8 @@
#include <string>
#include "graphics_factory.h"
#include "sound_factory.h"
#include "graphics_factory_gl.h"
#include "sound_factory.h"
#include "sound_factory_openal.h"
#include "sound_factory_none.h"
#include "leak_dumper.h"
@@ -23,8 +23,8 @@
using std::string;
using Shared::Graphics::GraphicsFactory;
using Shared::Sound::SoundFactory;
using Shared::Graphics::Gl::GraphicsFactoryGl;
using Shared::Sound::SoundFactory;
using Shared::Sound::OpenAL::SoundFactoryOpenAL;
using Shared::Sound::SoundFactoryNone;