[wine/f13/master: 5/5] Merge branch 'f14' into f13

[Andreas Bierfert]

commit 8654d9c78b11c8426cee06564c416a30ee553acd
Merge: 4b1061f 07526a7
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Wed Aug 25 16:18:52 2010 +0200

    Merge branch 'f14' into f13

 .gitignore |    1 +
 sources    |    2 +-
 wine.spec  |   12 ++++++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 151a41e,42391c9..426f531
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
 -wine-1.2.tar.bz2
  wine-1.3.0.tar.bz2
+ /wine-1.3.1.tar.bz2