diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:20:08 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:20:08 +0000 |
| commit | 953c525d7589178629f3e91e4bf4ea805a92a5b4 (patch) | |
| tree | 9411cddbd2f213fe4edf2150e2e8b02a9d27b4bf /libdirmgt | |
| parent | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (diff) | |
| parent | 5430151902aa7cb17458c0d71722a05fd379babf (diff) | |
Merge branch 'master' into xkb
Conflicts:
console-client/Makefile
Diffstat (limited to 'libdirmgt')
| -rw-r--r-- | libdirmgt/Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libdirmgt/Makefile b/libdirmgt/Makefile index 438061c6..f4e9f758 100644 --- a/libdirmgt/Makefile +++ b/libdirmgt/Makefile @@ -1,5 +1,4 @@ -# -# Copyright (C) 1995 Free Software Foundation +# Copyright (C) 1995, 2012 Free Software Foundation # Written by Michael I. Bushnell. # # This file is part of the GNU Hurd. @@ -21,6 +20,4 @@ dir := libdirmgt makemode := misc -LCLHDRS = dirmgt.h - include ../Makeconf |