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 /libcons | |
| parent | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (diff) | |
| parent | 5430151902aa7cb17458c0d71722a05fd379babf (diff) | |
Merge branch 'master' into xkb
Conflicts:
console-client/Makefile
Diffstat (limited to 'libcons')
| -rw-r--r-- | libcons/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libcons/Makefile b/libcons/Makefile index 38ca74a7..e0bf62c4 100644 --- a/libcons/Makefile +++ b/libcons/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 1994,95,96,97,98,99,2000,01,02,2005,2010 Free Software Foundation, Inc. +# Copyright (C) 1994,95,96,97,98,99,2000,01,02,2005,2010,2012 Free Software +# Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -24,7 +24,6 @@ SRCS= demuxer.c init-init.c init-loop.c opts-version.c extra-version.c \ cons-switch.c vcons-remove.c vcons-add.c vcons-open.c \ vcons-close.c vcons-destroy.c vcons-refresh.c vcons-scrollback.c \ vcons-input.c vcons-move-mouse.c vcons-event.c -LCLHDRS = priv.h mutations.h $(installhdrs) installhdrs = cons.h fs_notify-MIGSFLAGS = -imacros $(srcdir)/mutations.h |