diff options
author | jschauma <jschauma@pkgsrc.org> | 2003-06-02 03:14:50 +0000 |
---|---|---|
committer | jschauma <jschauma@pkgsrc.org> | 2003-06-02 03:14:50 +0000 |
commit | 49aa384ee7dcffd19d1a04e90136f58b78ce4f38 (patch) | |
tree | 3cf88d573578ad2b69a36d3935d74fb95f0d4675 /time/asclock-xlib | |
parent | e366d0c694f76afeff8379f738912bfa77414859 (diff) | |
download | pkgsrc-49aa384ee7dcffd19d1a04e90136f58b78ce4f38.tar.gz |
Resolve conflicts from last commit.
Diffstat (limited to 'time/asclock-xlib')
0 files changed, 0 insertions, 0 deletions