aboutsummaryrefslogtreecommitdiffstats
path: root/admin (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge from origin/emacs-26Paul Eggert2018-01-0144-44/+44
|\
| * Update copyright year to 2018Paul Eggert2018-01-0144-44/+44
* | Merge from origin/emacs-26Glenn Morris2017-12-201-12/+12
|\ \ | |/
| * ; Replace non-ascii quote characters in doc strings etcGlenn Morris2017-12-201-12/+12
* | Set minimum number of commits for gitmerge in batch modeGlenn Morris2017-12-181-0/+9
* | * admin/gitmerge.el (gitmerge-skip-regexp): Be stricter in batch mode.Glenn Morris2017-12-181-2/+10
* | Make gitmerge usable in batch modeGlenn Morris2017-12-181-4/+11
* | * admin/gitmerge.el (gitmerge-missing):Glenn Morris2017-12-121-0/+1
* | Merge from origin/emacs-26Glenn Morris2017-12-121-1/+720
|\ \ | |/
| * Import the latest IVD_Sequences.txtEli Zaretskii2017-12-121-1/+720
* | Fix gitmerge handling of automatic conflict reslutionGlenn Morris2017-12-121-11/+12
* | * admin/gitmerge.el (gitmerge-resolve): Disable buggy NEWS handling.Glenn Morris2017-12-111-1/+5
* | Work around reader limitations for old-style backquotes.Philipp Stephani2017-12-091-7/+12
* | * admin/gitmerge.el (gitmerge-resolve): Handle NEWS. (Bug#29366)Glenn Morris2017-12-011-19/+41
* | Don't hard-code gitmerge.el's default merge branchGlenn Morris2017-12-011-3/+19
* | * admin/gitmerge.el (gitmerge-resolve):Glenn Morris2017-12-011-2/+4
* | Add date to dependency and source zips for snapshotsPhillip Lord2017-11-302-17/+42
* | Update Build files for Emacs-27Phillip Lord2017-11-273-6/+7
* | Merge from origin/emacs-26Paul Eggert2017-11-2510-28/+28
|\ \ | |/
| * maint: shorten https://lists.gnu.org/archive/html/... linksPaul Eggert2017-11-2510-28/+28
* | Fix lower case installer namePhillip Lord2017-11-201-3/+1
* | Add date to snapshot filePhillip Lord2017-11-202-11/+25
* | Rebrand UninstallerPhillip Lord2017-11-171-1/+1
* | Fix install location for windows installerPhillip Lord2017-11-172-6/+26
* | Rebrand Windows installerPhillip Lord2017-11-151-0/+1
* | Merge from origin/emacs-26Paul Eggert2017-11-131-1/+0
|\ \ | |/
| * Simplify by removing HAVE_STRUCT_ATTRIBUTE_ALIGNEDPaul Eggert2017-11-131-1/+0
* | Merge from origin/emacs-26Paul Eggert2017-11-081-1/+1
|\ \ | |/
| * * admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc typo.Glenn Morris2017-11-081-1/+1
* | Merge from origin/emacs-26Paul Eggert2017-11-081-0/+5
|\ \ | |/
| * ; * CONTRIBUTE, admin/make-tarball.txt: Doc tweaks re 'emacs-announce'.Glenn Morris2017-11-031-0/+5
* | Add support for Windows installer buildPhillip Lord2017-11-052-11/+114
* | Simplify by assuming !_MSC_VER.Paul Eggert2017-11-021-1/+0
* | Merge from origin/emacs-26Paul Eggert2017-11-022-6/+6
|\ \ | |/
| * ; Spelling fixesPaul Eggert2017-11-012-6/+6
* | Merge from origin/emacs-26Paul Eggert2017-11-021-1/+1
|\ \ | |/
| * Fix some duplicate words typosGlenn Morris2017-10-271-1/+1
* | Merge from origin/emacs-26Paul Eggert2017-11-026-3/+510
|\ \ | |/
| * Update documentation for windows buildPhillip Lord2017-10-251-0/+92
| * Fix Bug#28982Michael Albinus2017-10-251-0/+1
| * Fix windows build errorsPhillip Lord2017-10-251-5/+7
| * Scripts to automate windows binary distributionPhillip Lord2017-10-243-0/+411
| * * admin/authors.el (authors-canonical-author-name):Glenn Morris2017-10-231-3/+4
* | Merge from origin/emacs-26Paul Eggert2017-10-201-5/+15
|\ \ | |/
| * Tweak format of list of old files in NEWS headerGlenn Morris2017-10-201-5/+15
* | Merge from origin/emacs-26Paul Eggert2017-10-202-2/+5
|\ \ | |/
| * Fix the MSDOS build.Eli Zaretskii2017-10-181-1/+1
| * Mention how to send CC to > 1 address in a bug reportTino Calancha2017-10-181-1/+4
| * Update authors.elNicolas Petton2017-10-111-1/+15
| * * admin/authors.el (authors-aliases): Additions.Nicolas Petton2017-10-111-0/+18