From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 15 Aug 2011 12:44:42 +0000 (+0100)
Subject: Merge branch 'master' of /home/mdw/public-git/misc
X-Git-Tag: 1.2.6~10
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/misc/commitdiff_plain/4fce9ec34226d1fa28698ef9571e32bead55bd11?hp=3ece3fc9e58c63542cf71a59baf1611efc3753b1

Merge branch 'master' of /home/mdw/public-git/misc

* 'master' of /home/mdw/public-git/misc:
  timeout.c: Fix exit codes; useful message on exec failure.
---

diff --git a/debian/changelog b/debian/changelog
index 6018d13..1451331 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nsict-utils (1.2.5) experimental; urgency=low
+
+  * Some user-invisible build system changes.
+  * timeout: New program: run a command for at most a givne time.
+
+ -- Mark Wooding <mdw@distorted.org.uk>  Tue, 07 Jun 2011 10:13:49 +0100
+
 nsict-utils (1.2.4) experimental; urgency=low
 
   * locking: Don't kill target program with alarm clock.