[xboard/f13/master: 7/7] Merge branch 'master' into f13

[Christopher Aillon]

commit e24a031da5b610daa55c0f54d227bd88ef9840fd
Merge: 618c264 e6b6f68
Author: Christopher Aillon <caillon at redhat.com>
Date:   Thu Apr 14 16:42:57 2011 -0700

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 .gitignore                        |    2 +
 chess.png                         |  Bin 652 -> 0 bytes
 sources                           |    2 +-
 xboard-4.2.4-rh1.patch            |   13 -------
 xboard-4.2.7-nostrip.patch        |   13 -------
 xboard-4.4.2-default_engine.patch |   14 --------
 xboard-4.5.1-default_engine.patch |   28 ++++++++++++++++
 xboard.desktop                    |    5 ++-
 xboard.spec                       |   63 ++++++++++++++++++++----------------
 9 files changed, 69 insertions(+), 71 deletions(-)
---
diff --cc .gitignore
index 07c1549,d3d6838..d1b0f9e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,3 @@@
  xboard-4.4.2.tar.gz
+ /xboard-4.5.1.tar.gz
++