diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-07-22 18:29:17 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-07-22 18:29:17 +0300 |
| commit | f882586eb8647345e5f3aadfb09135ecd8288ea7 (patch) | |
| tree | ce110f328804e7d861967bb3d6da63661c6e00f9 /README.md | |
| parent | b182fa4bb89a770d2e34da162eb46cdbaceb153b (diff) | |
| parent | afc38c0d72966e7b7c421e29799655a76a2122b3 (diff) | |
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# README.md
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/peds/Ped.cpp
# src/peds/Ped.h
# src/render/Renderer.cpp
# src/vehicles/Plane.cpp
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -21,8 +21,6 @@ such that we have a working game at all times. ## Preparing the environment for building -Currently only building on VS2015/2017/2019 (Windows) and GCC (Linux) is tested. - - Clone the repo. - Run `git submodule init` and `git submodule update`. - Point GTA_III_RE_DIR environment variable to GTA3 root folder. |