Permalink
Browse files

Merge branch 'master' of https://github.com/coelckers/gzdoom

# Conflicts:
#	src/scripting/vmthunks_actors.cpp
  • Loading branch information...
coelckers committed Dec 5, 2018
2 parents 6c9d0b1 + 101ebe1 commit eb282c0d11ed6a8d8306f50d3382e42f619b22ee
Showing with 1 addition and 0 deletions.
  1. +1 −0 src/scripting/vmthunks_actors.cpp
@@ -52,6 +52,7 @@
#include "p_local.h"
#include "p_effect.h"
#include "p_spec.h"
#include "actorinlines.h"
DVector2 AM_GetPosition();
int Net_GetLatency(int *ld, int *ad);

0 comments on commit eb282c0

Please sign in to comment.