chiark / gitweb /
Merge branch 'acctdump'
authorJonathan Amery <jdamery+zgit@ysolde.ucam.org>
Sun, 26 Oct 2014 14:18:43 +0000 (14:18 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 26 Oct 2014 14:19:15 +0000 (14:19 +0000)
commit09d4d38131e245335d3d680c358bfb2d1fa76dc4
tree6f230c0e15425a881955e7f96c29e5c98dadc2cb
parentbb740748a1be0c6c23e1666f331175ed50915380
parent4b09a1bc92281bf48e4e46acfea14d6bfaa42e61
Merge branch 'acctdump'

Conflicts:
cprogs/Makefile
cprogs/myopt.c
cprogs/myopt.h

* Makefile manually merged.
* Keep our version of myopt files as they are newer than acctdump's.
cprogs/Makefile