Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall
2014-01-16 23:18:34 +01:00
185 changed files with 204 additions and 204 deletions

View File

@@ -1,7 +1,7 @@
/*
** LuaJIT -- a Just-In-Time Compiler for Lua. http://luajit.org/
**
** Copyright (C) 2005-2013 Mike Pall. All rights reserved.
** Copyright (C) 2005-2014 Mike Pall. All rights reserved.
**
** Permission is hereby granted, free of charge, to any person obtaining
** a copy of this software and associated documentation files (the
@@ -33,7 +33,7 @@
#define LUAJIT_VERSION "LuaJIT 2.1.0-alpha"
#define LUAJIT_VERSION_NUM 20100 /* Version 2.1.0 = 02.01.00. */
#define LUAJIT_VERSION_SYM luaJIT_version_2_1_0_alpha
#define LUAJIT_COPYRIGHT "Copyright (C) 2005-2013 Mike Pall"
#define LUAJIT_COPYRIGHT "Copyright (C) 2005-2014 Mike Pall"
#define LUAJIT_URL "http://luajit.org/"
/* Modes for luaJIT_setmode. */