[sear/f15: 27/27] Merge branch 'master' into f15

Sun Jul 10 16:16:51 UTC 2011

commit 450d8d706c42946fdd6063e21b91180b480f679b
Merge: 57152aa 64c39e1
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sun Jul 10 11:16:44 2011 -0500

    Merge branch 'master' into f15
    
    Conflicts:
    	sear.spec

 .gitignore                       |    1 +
 cal3d-paths.patch                |  187 -----------
 sear-0.6.3-erisupgrade.patch     |   29 +--
 sear-0.6.3-gcc43.patch           |   93 ------
 sear-0.6.3-gcc44.patch           |  228 -------------
 sear-0.6.3-sigc2.patch           |  671 --------------------------------------
 sear-0.6.4-mercatorupgrade.patch |   11 +
 sear-compileopts.patch           |   23 ++
 sear-eris-api-change.patch       |  106 ++++++
 sear-lua-fix.patch               |   72 ++++
 sear-missing-includes.patch      |  165 ++++++++++
 sear.spec                        |   66 +++--
 sources                          |    2 +-
 13 files changed, 431 insertions(+), 1223 deletions(-)
---