From 2e61a2042461cf6c31420fb776b491d3a8caa9c1 Mon Sep 17 00:00:00 2001
From: Mads Kiilerich <mads@kiilerich.com>
Date: Nov 06 2013 00:52:22 +0000
Subject: Merge branch 'f19' into f20


---

diff --git a/.gitignore b/.gitignore
index 8db6795..32124fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@ tortoisehg-1.1.2.tar.gz
 /tortoisehg-2.9.tar.gz
 /tortoisehg-2.9.1.tar.gz
 /tortoisehg-2.9.2.tar.gz
+/tortoisehg-2.10.tar.gz
diff --git a/sources b/sources
index bb4e51b..09771c5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f8e368e7205f1daab2b022d1f6adc7ca  tortoisehg-2.9.2.tar.gz
+a74d514d4a6065323425fdb79e64a411  tortoisehg-2.10.tar.gz
diff --git a/tortoisehg.spec b/tortoisehg.spec
index 6056990..5cf0f98 100644
--- a/tortoisehg.spec
+++ b/tortoisehg.spec
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           tortoisehg
-Version:        2.9.2
+Version:        2.10
 Release:        1%{?dist}
 Summary:        Mercurial GUI command line tool thg
 Group:          Development/Tools
@@ -11,7 +11,7 @@ URL:            http://tortoisehg.bitbucket.org/
 Source0:        http://bitbucket.org/tortoisehg/targz/downloads/%{name}-%{version}.tar.gz
 BuildArch:      noarch
 BuildRequires:  python-devel, gettext, python-sphinx, PyQt4-devel, desktop-file-utils
-Requires:       python-iniparse, mercurial >= 2.6, mercurial < 2.8
+Requires:       python-iniparse, mercurial >= 2.7, mercurial < 2.9
 # gconf needed at util/shlib.py for browse_url(url).
 Requires:       gnome-python2-gconf
 Requires:       PyQt4 >= 4.6, qscintilla-python, python-pygments
@@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/nautilus-python/extensions/nautilus-thg.py*
 
 %changelog
+* Wed Nov 06 2013 Mads Kiilerich <mads@kiilerich.com> - 2.10-1
+- tortoisehg 2.10
+
 * Wed Oct 09 2013 Mads Kiilerich <mads@kiilerich.com> - 2.9.2-1
 - tortoisehg 2.9.2