Mercurial > mm7
comparison Media/MediaPlayer.cpp @ 2569:d433439699be
Слияние
author | Ritor1 |
---|---|
date | Thu, 21 May 2015 18:33:07 +0600 |
parents | d569340b05ff |
children | d87bfbd3bb3b |
comparison
equal
deleted
inserted
replaced
2568:f2f2595fe308 | 2569:d433439699be |
---|---|
1 #define _CRTDBG_MAP_ALLOC | 1 #define _CRTDBG_MAP_ALLOC |
2 #define _CRT_SECURE_NO_WARNINGS | |
2 #include <stdlib.h> | 3 #include <stdlib.h> |
3 #include <crtdbg.h> | 4 #include <crtdbg.h> |
4 | |
5 #include <vector> | 5 #include <vector> |
6 #include <deque> | 6 #include <deque> |
7 | |
8 #define _CRT_SECURE_NO_WARNINGS | |
9 | 7 |
10 #include "Engine/Engine.h" | 8 #include "Engine/Engine.h" |
11 | 9 |
12 #include "IO/Mouse.h" | 10 #include "IO/Mouse.h" |
13 #include "GUI/GUIWindow.h" | 11 #include "GUI/GUIWindow.h" |