branch: externals/package-x
commit bec9cdbd95bc3165293eaf731a574e20849b1bb5
Merge: f03a83c969 c38aa42083
Author: Fabián Ezequiel Gallina <fgall...@gnu.org>
Commit: Fabián Ezequiel Gallina <fgall...@gnu.org>

    Merge from origin/emacs-24
    
    a012c7b Fix copyright years by hand
    c38aa42 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

Reply via email to