aboutsummaryrefslogtreecommitdiff
path: root/src/lj_asm.c
diff options
context:
space:
mode:
authorMike Pall <mike>2019-12-08 19:50:36 +0100
committerMike Pall <mike>2019-12-08 19:50:36 +0100
commit1d9a337de6630746e3e8580aa855c0376c67d356 (patch)
tree17789d6e157442c8ec6c400a97bccc057d43be31 /src/lj_asm.c
parent05898a8824f119d586e5fb079f1e66d8cac38160 (diff)
parentde48d000941f58a8d4d816e9d227de8a4f3c9de6 (diff)
downloadluajit-1d9a337de6630746e3e8580aa855c0376c67d356.tar.gz
luajit-1d9a337de6630746e3e8580aa855c0376c67d356.tar.bz2
luajit-1d9a337de6630746e3e8580aa855c0376c67d356.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_asm.c')
-rw-r--r--src/lj_asm.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/lj_asm.c b/src/lj_asm.c
index ff07b7ee..c4c5dfdd 100644
--- a/src/lj_asm.c
+++ b/src/lj_asm.c
@@ -22,7 +22,6 @@
22#include "lj_ircall.h" 22#include "lj_ircall.h"
23#include "lj_iropt.h" 23#include "lj_iropt.h"
24#include "lj_mcode.h" 24#include "lj_mcode.h"
25#include "lj_iropt.h"
26#include "lj_trace.h" 25#include "lj_trace.h"
27#include "lj_snap.h" 26#include "lj_snap.h"
28#include "lj_asm.h" 27#include "lj_asm.h"