diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-02-13 14:20:16 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-02-13 14:20:16 +0000 |
| commit | 16f3e22820de84e7227dee7b85a690bdc1d561e0 (patch) | |
| tree | 0e963c2697d9b5163eb3a688938732b4b8ccac7e /configure.ac | |
| parent | 5aeddb8e0a314780585af7b8f19896a2be9815d4 (diff) | |
| parent | 06a09cf70713999a11ba9227baa00264c95c25e8 (diff) | |
Merge branch 'mock-account-store-54873'
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54873
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Conflicts:
tests/twisted/account-manager/avatar.py
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index a44d4f67..7cd8434f 100644 --- a/configure.ac +++ b/configure.ac @@ -82,7 +82,7 @@ if test -z "$XSLTPROC"; then AC_MSG_ERROR([xsltproc (from the libxslt source package) is required]) fi -AM_PATH_PYTHON([2.5]) +AM_PATH_PYTHON([2.6]) AC_MSG_CHECKING([for enough Python for the tests]) mc_want_twisted_tests=no if $PYTHON -c "import twisted.internet.reactor, dbus.mainloop.glib"\ |