zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-01-19 08:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into HEAD

Browse source
This commit is contained in:
Rachael Alexanderson 2019-02-06 08:05:38 -05:00
commit 20a9587bb7
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -133,7 +133,7 @@ script:
-DPK3_QUIET_ZIPDIR=YES \ -DPK3_QUIET_ZIPDIR=YES \
.. ..
- if [[ $TRAVIS_OS_NAME == 'windows' ]]; then cmake --build . -- -m; fi - if [[ $TRAVIS_OS_NAME == 'windows' ]]; then cmake --build . -- -m; fi
- if [[ $TRAVIS_OS_NAME != 'windows' ]]; then cmake --build . -- -j2; fi - if [[ $TRAVIS_OS_NAME != 'windows' ]]; then cmake --build . -- -j2 -k; fi
notifications: notifications:
email: false email: false

2
src/scripting/backend/codegen.h
View file

@ -2106,7 +2106,7 @@ public:
: FxExpression(EFX_Nop, p) : FxExpression(EFX_Nop, p)
{ {
isresolved = true; isresolved = true;
ValueType = TypeError; ValueType = TypeVoid;
} }
ExpEmit Emit(VMFunctionBuilder *build) ExpEmit Emit(VMFunctionBuilder *build)
{ {