From: Mike Pall <mike>
Date: Mon, 3 Jun 2013 19:21:45 +0000 (+0200)
Subject: Merge branch 'master' into v2.1
X-Git-Tag: v2.1.0-beta1~211
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fa97bef1fb93a42ba7452eeb23dd37bc2bd1d91;p=thirdparty%2FLuaJIT.git

Merge branch 'master' into v2.1
---

1fa97bef1fb93a42ba7452eeb23dd37bc2bd1d91
diff --cc src/Makefile
index fa5aed1c,999e2808..94bc0fd2
--- a/src/Makefile
+++ b/src/Makefile
@@@ -11,8 -11,8 +11,8 @@@
  ##############################################################################
  
  MAJVER=  2
--MINVER=  0
 -RELVER=  2
++MINVER=  1
 +RELVER=  0
  ABIVER=  5.1
  NODOTABIVER= 51