From d311959c2401e55e32143a77e8b65bbf2816d570 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sun, 14 Jul 2013 02:42:58 +1000
Subject: [PATCH] doc update: prepare for stable update

---
 index.html | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 9e01754ade..99866000cb 100644
--- a/index.html
+++ b/index.html
@@ -2675,7 +2675,42 @@ <h2 id="history">History</h2>
 
     <dl>
 
-    <dt>2012-04-12 &ndash; Release <span id="latest-version">2.22</span></dt>
+    <dt>2013-07-xx &ndash; Merge-from-master <span id="latest-version">2.22</span></dt>
+    <dd>
+        <p>
+        <a href="http://mxe.cc/#download">Download</a> |
+        <a href="http://hg.savannah.nongnu.org/hgweb/mingw-cross-env/log/2.22">Changelog</a>
+        </p>
+
+        <p>
+        Most packages were updated to their latest version.
+        </p>
+
+        <p>
+        Many new packages are supported:
+        alure, apr-util, apr, armadillo, cegui, cfitsio, cminpack,
+        flann, gtkglarea, gtkimageview, harfbuzz, hdf4, hdf5, hunspell,
+        icu4c, itk, lensfun, levmar, libf2c, libftdi, libgda, libgdamm,
+        libglade, liblqr-1, libmodplug, librtmp, libzip, log4cxx, mdbtools,
+        ncurses, netcdf, netpbm, ocaml-cairo, ocaml-camlimages, ocaml-core,
+        ocaml-findlib, ocaml-flexdll, ocaml-lablgl, ocaml-lablgtk2,
+        ocaml-native, ocaml-xml-light, opencv, opus, opusfile, pcl,
+        picomodel, plib, plibc, poppler, portablexdr, portmidi, protobuf,
+        qdbm, qt5, qtactiveqt, qtbase, qtdeclarative, qtgraphicaleffects,
+        qtimageformats, qtjsbackend, qtmultimedia, qtquick1, qtquickcontrols,
+        qtscript, qtsensors, qtserialport, qtsvg, qttools, qttranslations,
+        qtxmlpatterns, qwt, sdl_gfx, sfml, sox, teem, twolame, vtk6, wavpack,
+        wget, winpthreads, xapian-core, yasm
+        </p>
+
+        <p>
+        Added support for <a href="#supported-toolchains">mingw-w64 based toolchains</a>
+        targeting 32 & 64-bit architectures.
+        </p>
+
+    </dd>
+
+    <dt>2012-04-12 &ndash; Release 2.22</span></dt>
     <dd>
         <p>
         <a href="http://mxe.cc/#download">Download</a> |