[goldendict/f12/master: 23/23] Merge branch 'f13' into f12

[helloworld1]

commit 9280c6be9b66a2139bc1cbefb60c7199c5f0e049
Merge: bdd30b0 8993713
Author: Liberty <mrlhwliberty at gmail.com>
Date:   Wed Aug 4 09:39:06 2010 -0400

    Merge branch 'f13' into f12
    
    Conflicts:
    	.gitignore
    	goldendict.spec
    	sources

 .gitignore      |    3 ++-
 goldendict.spec |   24 +++++++++++++++++-------
 sources         |    3 ++-
 3 files changed, 21 insertions(+), 9 deletions(-)
---
diff --cc .gitignore
index 492e91c,e1e7534..cbe3978
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,6 +1,2 @@@
- goldendict-ceab951.tar.gz
 -goldendict-c33fa2c.tar.gz
 -<<<<<<< HEAD
 -=======
+ goldendict-4fa567e.tar.gz
+ goldendict-415f35e.tar.gz
 ->>>>>>> master