[src/trunk]: src/external/mit/lua/dist/src Resolve conflicts.

[alnsn <alnsn%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/db1d891d7946
branches:  trunk
changeset: 778060:db1d891d7946
user:      alnsn <alnsn%NetBSD.org@localhost>
date:      Thu Mar 15 00:17:22 2012 +0000

description:
Resolve conflicts.

diffstat:

 external/mit/lua/dist/src/luaconf.h |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (13 lines):

diff -r a638b4518e8c -r db1d891d7946 external/mit/lua/dist/src/luaconf.h
--- a/external/mit/lua/dist/src/luaconf.h       Thu Mar 15 00:16:07 2012 +0000
+++ b/external/mit/lua/dist/src/luaconf.h       Thu Mar 15 00:17:22 2012 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: luaconf.h,v 1.2 2010/10/31 11:19:42 mbalmer Exp $ */
+/*     $NetBSD: luaconf.h,v 1.3 2012/03/15 00:17:22 alnsn Exp $        */
 
 /*
-** Id: luaconf.h,v 1.82.1.7 2008/02/11 16:25:08 roberto Exp $
+** $Id: luaconf.h,v 1.3 2012/03/15 00:17:22 alnsn Exp $
 ** Configuration file for Lua
 ** See Copyright Notice in lua.h
 */