Mercurial > mm7
comparison Game.cpp @ 1292:24bc24b64ec2
Слияние
author | Ritor1 |
---|---|
date | Fri, 14 Jun 2013 16:06:30 +0600 |
parents | 0aeac0b9ca30 |
children | 1803172dffd9 |
comparison
equal
deleted
inserted
replaced
1291:1577d75db258 | 1292:24bc24b64ec2 |
---|---|
36 #include "Events.h" | 36 #include "Events.h" |
37 #include "Arcomage.h" | 37 #include "Arcomage.h" |
38 #include "texts.h" | 38 #include "texts.h" |
39 #include "GUIFont.h" | 39 #include "GUIFont.h" |
40 #include "Log.h" | 40 #include "Log.h" |
41 #include "Lights.h" | |
42 #include "mm7_data.h" | |
41 | 43 |
42 //#include "MM7.h" | 44 //#include "MM7.h" |
43 | 45 |
44 | 46 |
45 | 47 |