[mingw-wxWidgets: 3/3] Merge branch 'f17'

[sailer]

commit 5662f8d3e7ee053249e94f6080cf408a3f26d051
Merge: 9efcc89 a807a11
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Tue Aug 14 02:13:57 2012 +0200

    Merge branch 'f17'
    
    Conflicts:
    	mingw-wxWidgets.spec

 mingw-wxWidgets.spec             |  227 +++++++++++-----
 wxWidgets-2.8.12-mingw64-1.patch |  559 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 717 insertions(+), 69 deletions(-)
---
diff --cc mingw-wxWidgets.spec
index c23d1ef,ef9498a..495dc66
--- a/mingw-wxWidgets.spec
+++ b/mingw-wxWidgets.spec
@@@ -163,8 -249,11 +249,11 @@@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir
  
  
  %changelog
+ * Mon Aug 13 2012 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.8.12-11
+ - enable 64bit build
+ 
 -* Wed Aug  1 2012 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.8.12-10
 -- Rebuild (#844813)
 +* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.12-10
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
  
  * Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.8.12-9
  - Rebuild against the mingw-w64 toolchain