Module Name: src
Committed By: alnsn
Date: Thu Mar 15 00:17:22 UTC 2012
Modified Files:
src/external/mit/lua/dist/src: luaconf.h
Log Message:
Resolve conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/lua/dist/src/luaconf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/lua/dist/src/luaconf.h
diff -u src/external/mit/lua/dist/src/luaconf.h:1.2 src/external/mit/lua/dist/src/luaconf.h:1.3
--- src/external/mit/lua/dist/src/luaconf.h:1.2 Sun Oct 31 11:19:42 2010
+++ src/external/mit/lua/dist/src/luaconf.h Thu Mar 15 00:17:22 2012
@@ -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
*/
