diff options
| author | mbalmer <mbalmer@NetBSD.org> | 2017-04-26 13:09:12 +0000 |
|---|---|---|
| committer | mbalmer <mbalmer@NetBSD.org> | 2017-04-26 13:09:12 +0000 |
| commit | 899c7d50ee79b872797feea3e418034f95a36d11 (patch) | |
| tree | 381daafa7dd656316610e3961c90d6d2c56af9d9 /external/mit/lua/dist/src/lcode.h | |
| parent | 034e5ddb0c1e167fec5bce47ef3e7b6edd725f45 (diff) | |
import conflict resolution
Diffstat (limited to 'external/mit/lua/dist/src/lcode.h')
| -rw-r--r-- | external/mit/lua/dist/src/lcode.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/mit/lua/dist/src/lcode.h b/external/mit/lua/dist/src/lcode.h index b0becd7e2d3..cd805aa854a 100644 --- a/external/mit/lua/dist/src/lcode.h +++ b/external/mit/lua/dist/src/lcode.h @@ -1,4 +1,4 @@ -/* $NetBSD: lcode.h,v 1.6 2017/04/26 12:49:34 mbalmer Exp $ */ +/* $NetBSD: lcode.h,v 1.7 2017/04/26 13:17:33 mbalmer Exp $ */ /* ** Id: lcode.h,v 1.64 2016/01/05 16:22:37 roberto Exp |
