diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-01-20 19:32:03 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-01-20 19:32:03 +0200 |
| commit | cc94419a7281fde133a5dc17c46cc62ae061a58c (patch) | |
| tree | 300a1e3c7d68e1fe32a3ba4491608bf18a1435b2 /src/extras | |
| parent | ba34d7218359ceb76dd525bdffbee5974505b425 (diff) | |
| parent | c7c7eff9180afc3e0271bdbdad28297fcd374694 (diff) | |
Merge branch 'miami' into lcs
# Conflicts:
# src/control/Script.cpp
# src/control/Script4.cpp
# src/render/Weather.cpp
# src/render/Weather.h
# src/vehicles/Automobile.cpp
Diffstat (limited to 'src/extras')
| -rw-r--r-- | src/extras/custompipes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/extras/custompipes.h b/src/extras/custompipes.h index 3c779e31..faf99efc 100644 --- a/src/extras/custompipes.h +++ b/src/extras/custompipes.h @@ -1,7 +1,7 @@ #pragma once -#ifdef EXTENDED_PIPELINES #ifdef LIBRW +#ifdef EXTENDED_PIPELINES namespace CustomPipes { |