Merge branch 'v0.16.x'

Conflicts: NEWS configure.ac
2011-12-13 21:57:44 +01:00
parent 006b8fa3f0 96ad5b8444
commit aa4f45b9a5
9 changed files with 36 additions and 16 deletions
--- a/src/timer.c
+++ b/src/timer.c
@@ -81,7 +81,7 @@ timer_delay(const struct timer *timer)
 	if (delay > G_MAXINT)
 		delay = G_MAXINT;

-	return delay / 1000;
+	return delay;
 }

 void timer_sync(struct timer *timer)