Permalink
Browse files

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

  • Loading branch information...
raa-eruanna committed Feb 6, 2019
2 parents d96d0b4 + 78c0b7f commit 20a9587bb7e1d9786869f31e9d85a9411f97e3f6
Showing with 2 additions and 2 deletions.
  1. +1 −1 .travis.yml
  2. +1 −1 src/scripting/backend/codegen.h
@@ -133,7 +133,7 @@ script:
-DPK3_QUIET_ZIPDIR=YES \
..
- 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:
email: false
@@ -2106,7 +2106,7 @@ class FxNop : public FxExpression
: FxExpression(EFX_Nop, p)
{
isresolved = true;
ValueType = TypeError;
ValueType = TypeVoid;
}
ExpEmit Emit(VMFunctionBuilder *build)
{

0 comments on commit 20a9587

Please sign in to comment.