summaryrefslogtreecommitdiff
path: root/external/mit/lua/dist/src/lstring.h
diff options
context:
space:
mode:
authormbalmer <mbalmer@NetBSD.org>2017-04-26 13:09:12 +0000
committermbalmer <mbalmer@NetBSD.org>2017-04-26 13:09:12 +0000
commit899c7d50ee79b872797feea3e418034f95a36d11 (patch)
tree381daafa7dd656316610e3961c90d6d2c56af9d9 /external/mit/lua/dist/src/lstring.h
parent034e5ddb0c1e167fec5bce47ef3e7b6edd725f45 (diff)
import conflict resolution
Diffstat (limited to 'external/mit/lua/dist/src/lstring.h')
-rw-r--r--external/mit/lua/dist/src/lstring.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/external/mit/lua/dist/src/lstring.h b/external/mit/lua/dist/src/lstring.h
index a9f19f19561..9e56a2e78dc 100644
--- a/external/mit/lua/dist/src/lstring.h
+++ b/external/mit/lua/dist/src/lstring.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lstring.h,v 1.7 2017/04/26 12:49:34 mbalmer Exp $ */
+/* $NetBSD: lstring.h,v 1.8 2017/04/26 13:17:33 mbalmer Exp $ */
/*
** Id: lstring.h,v 1.61 2015/11/03 15:36:01 roberto Exp