[OpenLP/f17: 5/5] 1.9.10-2.

[Tim Bentley]

commit 92032cd831d78c1eb37e0e96480215607fc635e7
Merge: 9834f83 aabffb4
Author: Tim Bentley <Tim.Bentley at gmail.com>
Date:   Sat Jun 23 19:41:31 2012 +0100

    1.9.10-2.

 .gitignore  |    4 ++++
 OpenLP.spec |   10 ++++++++--
 sources     |    4 ++++
 3 files changed, 16 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 861584e,81c55a2..d5ea10f
--- a/.gitignore
+++ b/.gitignore
@@@ -8,3 -8,4 +8,7 @@@ OpenLP-1.9.2.1.tar.g
  /OpenLP-1.9.7.tar.gz
  /OpenLP-1.9.8.tar.gz
  /OpenLP-1.9.9.tar.gz
++<<<<<<< HEAD
++=======
+ /OpenLP-1.9.10.tar.gz
++>>>>>>> master
diff --cc sources
index fb73751,e46bd08..a803e8b
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +e64de9e14be9ce0944b27db996a9c3b8  OpenLP-1.9.9.tar.gz
++=======
+ 2c8eb587a56cc6e31f64ebee052b2842  OpenLP-1.9.10.tar.gz
++>>>>>>> master