[freefem++/el6: 34/34] Merge branch 'master' into el6

[Dominik Mierzejewski]

commit 0b399e07384624ea0124afc4717d97d305ffaf8f
Merge: 1f93921 88afc84
Author: Dominik Mierzejewski <rpm at greysector.net>
Date:   Sun Jul 15 20:29:55 2012 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 freefem++-compile.patch    |   19 +++++
 freefem++-gcc44-link.patch |   12 ---
 freefem++-gcc44.patch      |   13 ---
 freefem++-gcc47.patch      |   11 +++
 freefem++-rpm.patch        |  182 +++++++++++++++++--------------------------
 freefem++.spec             |   91 +++++++++++++++++++---
 sources                    |    2 +-
 7 files changed, 183 insertions(+), 147 deletions(-)
---