From c4fa998f80e998a8e76dd8191bf4397aae91de0e Mon Sep 17 00:00:00 2001
From: enge <enge@211d60ee-9f03-0410-a15a-8952a2c7a4e4>
Date: Wed, 10 Mar 2010 16:08:51 +0000
Subject: resolved conflict in TODO

git-svn-id: svn://scm.gforge.inria.fr/svn/mpc/trunk@738 211d60ee-9f03-0410-a15a-8952a2c7a4e4
---
 TODO | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'TODO')

diff --git a/TODO b/TODO
index 995b52b..c7a6cdd 100644
--- a/TODO
+++ b/TODO
@@ -6,9 +6,9 @@ Bench:
 Efficiency:
 - from Andreas Enge 16 September 2008:
   Once mpc_sin_cos exists, improve mpc_tan to use it
+- from Andreas Enge 10 March 2010:
+  binary algorithm for mpc_pow_ui
 - in mpc_pow, try to avoid the initial mpc_log computation to detect overflow
-- implement binary exponentiation in mpc_pow_ui
-  (cf http://trac.sagemath.org/sage_trac/ticket/4446)
 
 New functions to implement:
 - from Andreas Enge 16 September 2008:
-- 
cgit v1.2.1