Showing with 21 additions and 9 deletions.

+13 −5 .mailmap

+5 −1 AUTHORS.txt

+1 −1 package.json

+1 −1 qunit/qunit.css

+1 −1 qunit/qunit.js
diff --git a/.mailmap b/.mailmap
@@ -64,20 +64,28 @@ Sergii Kliuchnyk <sergiikliuchnyk@gmail.com>
 Corey Frang <gnarf@gnarf.net>
 John Reeves <john@jonnyreeves.co.uk> <jonny.reeves@yamaha.co.uk>
 John Reeves <john@jonnyreeves.co.uk>
-Antranig Basman <antranig.basman@colorado.edu>
 Vivin Paliath <vivin.paliath@gmail.com>
 Joshua Niehus <jm.niehus@gmail.com>
-Gavin Huang <gravof@gmail.com>
+Glen Huang <curvedmark@gmail.com> <gravof@gmail.com>
+Glen Huang <curvedmark@gmail.com>
 Jonas Ulrich <jochenulrich@t-online.de>
-Jamie Hoover <dont.tase@me.com>
+Jamie Hoover <jamie@ninjaui.com> <dont.tase@me.com>
+Jamie Hoover <jamie@ninjaui.com>
 James M. Greene <james.m.greene@gmail.com>
 Rodney Rehm <mail+github@rodneyrehm.de>
 Peter Wagenet <peter.wagenet@gmail.com>
-clog <clog@posxto.eo>
+Clog <flewya@gmail.com> <clog@posxto.eo>
+Clog <flewya@gmail.com>
+Antranig Basman <amb26ohloh@ponder.org.uk> <antranig.basman@colorado.edu>
+Antranig Basman <amb26ohloh@ponder.org.uk>
 Matthew Mirande <itsbusticated@gmail.com>
 Jared Wyles <jared.wyles@gmail.com>
 Dmitry Gusev <dmitry.gusev@gmail.com>
 Ian Wallis <qazzian@gmail.com> <ian@travelmatch.co.uk>
 Ian Wallis <qazzian@gmail.com>
 Dan Andreescu <dan.andreescu@gmail.com> <dandreescu@wikimedia.org>
-Dan Andreescu <dan.andreescu@gmail.com>
+Dan Andreescu <dan.andreescu@gmail.com>
+Matthew DuVall <mduvall89@gmail.com> <mduvall@box.com>
+Matthew DuVall <mduvall89@gmail.com>
+Dave K. Smith <dave.k.smith@gmail.com>
+David Vollbracht <david.vollbracht@gmail.com>
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -55,17 +55,21 @@ Alex J Burke <alex@alexjeffburke.com>
 Sergii Kliuchnyk <sergiikliuchnyk@gmail.com>
 Corey Frang <gnarf@gnarf.net>
 John Reeves <john@jonnyreeves.co.uk>
+Antranig Basman <amb26ohloh@ponder.org.uk>
 Vivin Paliath <vivin.paliath@gmail.com>
 Joshua Niehus <jm.niehus@gmail.com>
+Glen Huang <curvedmark@gmail.com>
 Jonas Ulrich <jochenulrich@t-online.de>
 Jamie Hoover <jamie@ninjaui.com>
 James M. Greene <james.m.greene@gmail.com>
 Rodney Rehm <mail+github@rodneyrehm.de>
 Peter Wagenet <peter.wagenet@gmail.com>
 Clog <flewya@gmail.com>
-Antranig Basman <amb26ohloh@ponder.org.uk>
 Matthew Mirande <itsbusticated@gmail.com>
 Jared Wyles <jared.wyles@gmail.com>
 Dmitry Gusev <dmitry.gusev@gmail.com>
 Ian Wallis <qazzian@gmail.com>
 Dan Andreescu <dan.andreescu@gmail.com>
+Matthew DuVall <mduvall89@gmail.com>
+Dave K. Smith <dave.k.smith@gmail.com>
+David Vollbracht <david.vollbracht@gmail.com>
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "qunitjs",
   "title": "QUnit",
   "description": "An easy-to-use JavaScript Unit Testing framework.",
-  "version": "1.12.0pre",
+  "version": "1.12.0",
   "author": {
     "name": "jQuery Foundation and other contributors",
     "url": "https://github.com/jquery/qunit/blob/master/AUTHORS.txt"

diff --git a/qunit/qunit.css b/qunit/qunit.css
@@ -1,5 +1,5 @@
 /**
- * QUnit v1.12.0pre - A JavaScript Unit Testing Framework
+ * QUnit v1.12.0 - A JavaScript Unit Testing Framework
  *
  * http://qunitjs.com
  *

diff --git a/qunit/qunit.js b/qunit/qunit.js
@@ -1,5 +1,5 @@
 /**
- * QUnit v1.12.0pre - A JavaScript Unit Testing Framework
+ * QUnit v1.12.0 - A JavaScript Unit Testing Framework
  *
  * http://qunitjs.com
  *