mirror of
https://github.com/halpz/re3.git
synced 2025-06-26 18:56:21 +00:00
Merge branch 'miami' into lcs
# Conflicts: # README.md # gamefiles/TEXT/american.gxt # gamefiles/TEXT/french.gxt # gamefiles/TEXT/german.gxt # gamefiles/TEXT/italian.gxt # gamefiles/TEXT/spanish.gxt # src/audio/AudioManager.h # src/control/Garages.cpp # src/control/Garages.h # src/control/Script5.cpp # src/core/config.h # utils/gxt/american.txt # utils/gxt/spanish.txt
This commit is contained in:
@ -17107,6 +17107,12 @@ This track contains a sample of "Next Level" as performed by Showbiz & AG. Court
|
||||
[CR19_20:CRED01]
|
||||
~n~ ~n~Donna Young, Richie Zito
|
||||
|
||||
[FEM_PED]
|
||||
PED DENSITY
|
||||
|
||||
[FEM_CAR]
|
||||
CAR DENSITY
|
||||
|
||||
[DUMMY]
|
||||
THIS LABEL NEEDS TO BE HERE !!!
|
||||
AS THE LAST LABEL DOES NOT GET COMPILED
|
@ -17452,6 +17452,12 @@ This track contains a sample of "Next Level" as performed by Showbiz & AG. Court
|
||||
[CR19_20:CRED01]
|
||||
~n~ ~n~Donna Young, Richie Zito
|
||||
|
||||
[FEM_PED]
|
||||
PED DENSITY
|
||||
|
||||
[FEM_CAR]
|
||||
CAR DENSITY
|
||||
|
||||
[DUMMY]
|
||||
THIS LABEL NEEDS TO BE HERE !!!
|
||||
AS THE LAST LABEL DOES NOT GET COMPILED
|
@ -17455,6 +17455,12 @@ This track contains a sample of "Next Level" as performed by Showbiz & AG. Court
|
||||
[CR19_20:CRED01]
|
||||
~n~ ~n~Donna Young, Richie Zito
|
||||
|
||||
[FEM_PED]
|
||||
PED DENSITY
|
||||
|
||||
[FEM_CAR]
|
||||
CAR DENSITY
|
||||
|
||||
[DUMMY]
|
||||
THIS LABEL NEEDS TO BE HERE !!!
|
||||
AS THE LAST LABEL DOES NOT GET COMPILED
|
Reference in New Issue
Block a user