Mercurial > mm7
comparison UI/UiGame.cpp @ 1554:e303d8a9bcdc
Merge
author | Grumpy7 |
---|---|
date | Sat, 07 Sep 2013 21:14:48 +0200 |
parents | c4ab816fcc5e |
children | 434b796cdfd3 fa0e700bcc80 |
comparison
equal
deleted
inserted
replaced
1553:b98812ead5d9 | 1554:e303d8a9bcdc |
---|---|
1 #ifdef _MSC_VER | 1 #ifdef _MSC_VER |
2 #define _CRT_SECURE_NO_WARNINGS | 2 #define _CRT_SECURE_NO_WARNINGS |
3 #endif | 3 #endif |
4 | |
5 #include <assert.h> | |
6 | 4 |
7 #include "..\Texture.h" | 5 #include "..\Texture.h" |
8 #include "..\MM7.h" | 6 #include "..\MM7.h" |
9 | 7 |
10 #include "..\Mouse.h" | 8 #include "..\Mouse.h" |