Merge branch 'master' into v2.1

2019-12-08 19:50:36 +01:00
parent 05898a8824 de48d00094
commit 1d9a337de6
7 changed files with 16 additions and 13 deletions
--- a/src/lj_asm.c
+++ b/src/lj_asm.c
@@ -22,7 +22,6 @@
 #include "lj_ircall.h"
 #include "lj_iropt.h"
 #include "lj_mcode.h"
-#include "lj_iropt.h"
 #include "lj_trace.h"
 #include "lj_snap.h"
 #include "lj_asm.h"