diff options
| author | Fabián Ezequiel Gallina | 2015-01-28 00:09:39 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina | 2015-01-28 00:09:39 -0300 |
| commit | 8e9166c92c97e7c2041eecee4e00d412a1eca1be (patch) | |
| tree | 41dc296808281e0883fcc3f70b4323fbad65b69c /src | |
| parent | be2d23e58721b7acc68c0ea654a38e5109df2aa2 (diff) | |
| parent | a012c7bbca887c3da837ce3d7ec01be697cffe64 (diff) | |
| download | emacs-8e9166c92c97e7c2041eecee4e00d412a1eca1be.tar.gz emacs-8e9166c92c97e7c2041eecee4e00d412a1eca1be.zip | |
Merge from origin/emacs-24
a012c7b Fix copyright years by hand
732fd4c Update copyright year to 2015
Conflicts:
INSTALL.REPO
admin/notes/lel-TODO
doc/man/grep-changelog.1
doc/misc/eww.texi
etc/CONTRIBUTE
etc/GNU
etc/NEWS
etc/refcards/emacsver.tex
etc/refcards/ru-refcard.tex
lib-src/grep-changelog
lib-src/test-distrib.c
lib/alloca.in.h
lib/binary-io.h
lib/c-ctype.h
lib/c-strcasecmp.c
lib/c-strncasecmp.c
lib/careadlinkat.c
lib/close-stream.c
lib/dosname.h
lib/dup2.c
lib/filemode.h
lib/fpending.c
lib/fpending.h
lib/getgroups.c
lib/getloadavg.c
lib/getopt.in.h
lib/getopt1.c
lib/getopt_int.h
lib/gettext.h
lib/gettime.c
lib/gettimeofday.c
lib/group-member.c
lib/md5.c
lib/md5.h
lib/memrchr.c
lib/sha1.c
lib/sig2str.c
lib/stdarg.in.h
lib/stdbool.in.h
lib/stdlib.in.h
lib/strftime.c
lib/strtoimax.c
lib/strtol.c
lib/strtoll.c
lib/strtoull.c
lib/tempname.c
lib/time_r.c
lib/unsetenv.c
lib/xalloc-oversized.h
lisp/gnus/gnus-setup.el
lisp/progmodes/cap-words.el
lisp/w32-common-fns.el
m4/alloca.m4
m4/dup2.m4
m4/filemode.m4
m4/getgroups.m4
m4/getloadavg.m4
m4/gettime.m4
m4/gettimeofday.m4
m4/gnulib-common.m4
m4/group-member.m4
m4/manywarnings.m4
m4/memrchr.m4
m4/mktime.m4
m4/pathmax.m4
m4/pthread_sigmask.m4
m4/sig2str.m4
m4/ssize_t.m4
m4/st_dm_mode.m4
m4/stat-time.m4
m4/stdarg.m4
m4/stdbool.m4
m4/stddef_h.m4
m4/stdio_h.m4
m4/strftime.m4
m4/strtoimax.m4
m4/strtoll.m4
m4/strtoull.m4
m4/strtoumax.m4
m4/time_h.m4
m4/timer_time.m4
m4/timespec.m4
m4/unistd_h.m4
m4/utimbuf.m4
nextstep/README
nt/addsection.c
src/insdel.c
src/w32heap.c
test/automated/package-x-test.el
Diffstat (limited to 'src')
| -rw-r--r-- | src/insdel.c | 5 | ||||
| -rw-r--r-- | src/w32heap.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/insdel.c b/src/insdel.c index 3b5b520aac8..80650be25ae 100644 --- a/src/insdel.c +++ b/src/insdel.c | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | /* Buffer insertion/deletion and gap motion for GNU Emacs. | 1 | /* Buffer insertion/deletion and gap motion for GNU Emacs. |
| 2 | 2 | Copyright (C) 1985-1986, 1993-1995, 1997-2015 Free Software | |
| 3 | Copyright (C) 1985-1986, 1993-1995, 1997-2015 Free Software Foundation, | 3 | Foundation, Inc. |
| 4 | Inc. | ||
| 5 | 4 | ||
| 6 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 7 | 6 | ||
diff --git a/src/w32heap.c b/src/w32heap.c index d5a9dae0aa4..ee0eb161502 100644 --- a/src/w32heap.c +++ b/src/w32heap.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Heap management routines for GNU Emacs on the Microsoft Windows | 1 | /* Heap management routines for GNU Emacs on the Microsoft Windows API. |
| 2 | API. Copyright (C) 1994, 2001-2015 Free Software Foundation, Inc. | 2 | Copyright (C) 1994, 2001-2015 Free Software Foundation, Inc. |
| 3 | 3 | ||
| 4 | This file is part of GNU Emacs. | 4 | This file is part of GNU Emacs. |
| 5 | 5 | ||