Mercurial > mm7
diff Arcomage.cpp @ 1026:6afa77761a00
Слияние
author | Ritor1 |
---|---|
date | Tue, 21 May 2013 12:43:08 +0600 |
parents | c45d51b3f4f4 |
children | 3a5c8df8381d |
line wrap: on
line diff
--- a/Arcomage.cpp Tue May 21 12:42:57 2013 +0600 +++ b/Arcomage.cpp Tue May 21 12:43:08 2013 +0600 @@ -1,5 +1,6 @@ #include <string> +#include "LightmapBuilder.h" #include "Arcomage.h" #include "VideoPlayer.h" #include "AudioPlayer.h" @@ -13,7 +14,6 @@ #include "Events2D.h" #include "VectorTypes.h" #include "texts.h" -#include "mm7_data.h"