mirror of
https://github.com/GTAmodding/re3.git
synced 2025-10-08 20:50:35 +00:00
Merge branch 'master' into VC/TextFinish
# Conflicts: # src/text/Text.cpp
This commit is contained in:
commit
9dba2386bb
7 changed files with 35 additions and 31 deletions
|
@ -11,6 +11,7 @@
|
|||
#include "Clock.h"
|
||||
#include "Date.h"
|
||||
#include "FileMgr.h"
|
||||
#include "Font.h"
|
||||
#include "Frontend.h"
|
||||
#include "GameLogic.h"
|
||||
#include "Gangs.h"
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
#include "crossplatform.h"
|
||||
|
||||
#include "FileMgr.h"
|
||||
#include "Font.h"
|
||||
#ifdef MORE_LANGUAGES
|
||||
#include "Game.h"
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue