Skip to content

Commit

Permalink
Merge *history only* from branch 'luajit/v2.1' commit fd37da0 into pu…
Browse files Browse the repository at this point in the history
…ll-luajit

This merge is created with 'git merge -s ours' to keep the existing
RaptorJIT code while merging in the commit IDs from LuaJIT.

Invariant: Each commit-id merged repreents a change that has been
"processed" and should not need to be considered again. "Processed"
means either cherry picked (for changes we want in RaptorJIT) or
ignored (for changes we don't want.)
  • Loading branch information
lukego committed Aug 13, 2017
2 parents c0165a6 + fd37da0 commit 340f702
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 340f702

Please sign in to comment.