[mingw-cximage/f17: 4/5] Merge branch 'master' into f17

[Marc-André Lureau]

commit 57a33b26f99f875f866fd8342d41c1205e019ac2
Merge: f7bac24 5bb20cd
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Tue May 29 14:45:26 2012 +0200

    Merge branch 'master' into f17

 cximage-6.0.0-disable-some-formats.patch |   16 +++
 cximage-6.0.0-fix-include-name.patch     |   13 ++
 cximage-6.0.0-std_min_max.patch          |   34 ++++++
 mingw-cximage.spec                       |  184 ++++++++++++++++++++++++++++++
 4 files changed, 247 insertions(+), 0 deletions(-)
---