summaryrefslogtreecommitdiff
path: root/admin
Commit message (Expand)AuthorAgeFilesLines
* * admin/notes/bzrmerge: Comment on skipped revisions.Glenn Morris2011-01-221-0/+5
* * make-tarball.txt: Suggest 'autoreconf -I m4 --force'Paul Eggert2011-01-192-2/+7
* * admin/notes/bzr: Fix typos in previous.Glenn Morris2011-01-171-2/+2
* * admin/notes/bzr: More bzrmerge notes.Glenn Morris2011-01-171-4/+14
* * admin/bzrmerge.el: Fix paren typo in previous.Glenn Morris2011-01-171-1/+1
* * admin/notes/bzr: Add some more bzrmerge details.Glenn Morris2011-01-171-4/+15
* * notes/bzr (Installing changes from gnulib): New section.Paul Eggert2011-01-172-0/+26
* * admin/bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be inStefan Monnier2011-01-172-0/+16
* Merge from mainline.Paul Eggert2011-01-1735-46/+49
|\
| * Refill some copyright headers.Glenn Morris2011-01-151-2/+2
| * Nuke arch-tags.Glenn Morris2011-01-1527-32/+0
| * * admin/charsets/cp51932.awk: No longer print arch-tag.Glenn Morris2011-01-152-5/+1
| * * admin/charsets/eucjp-ms.awk: No longer print arch-tag.Glenn Morris2011-01-152-3/+2
| * Add 2011 to remaining FSF/AIST copyright years.Glenn Morris2011-01-152-2/+2
| * * admin/notes/bzr: More on previous.Glenn Morris2011-01-151-0/+5
| * * admin/notes/bzr: Add an idiot's guide to merging between branches.Glenn Morris2011-01-151-0/+29
| * bzrmerge.el trivia.Glenn Morris2011-01-152-2/+8
* | Merge from mainline.Paul Eggert2011-01-1431-43/+56
|\ \ | |/
| * ChangeLog merge fixes.Glenn Morris2011-01-141-1/+0
| * Merge from emacs-23Stefan Monnier2011-01-1431-43/+57
| |\
| | * * admin/admin.el (set-copyright): Also handle \year in refcards/*.tex.Glenn Morris2011-01-022-15/+26
| | * Revert accidental update of non-FSF copyright from 2010-01-13T08:35:10Z!rgm@g...Glenn Morris2011-01-021-1/+1
| | * Add 2011 to FSF/AIST copyright years.Glenn Morris2011-01-0233-35/+34
* | | Merge from mainline.Paul Eggert2011-01-132-5/+10
|\ \ \ | |/ /
| * | * admin/bzrmerge.el: Require cl when compiling.Glenn Morris2011-01-132-4/+9
* | | Merge from mainline.Paul Eggert2011-01-111-5/+5
|\ \ \ | |/ /
| * | * admin/bzrmerge.el: Standardize copyright and license headers.Glenn Morris2011-01-111-5/+5
* | | Update copyright notes to match recent gnulib-related changes.Paul Eggert2011-01-092-10/+25
|/ /
* | * install-sh, mkinstalldirs, move-if-change: Update from masterPaul Eggert2011-01-072-3/+9
* | * notes/copyright: Report status more accurately for non-GPL files.Paul Eggert2011-01-072-0/+16
* | Merge changes from emacs-23 branchChong Yidong2011-01-021-0/+5
|\ \ | |/
| * Fix bug #7716 with PNG image support libraries on Windows.Eli Zaretskii2010-12-312-8/+21
* | * admin/bzrmerge.el: New file to help merge branches while skippingStefan Monnier2010-12-262-0/+301
* | Remove EXPLICIT_SIGN_EXTEND.Andreas Schwab2010-12-032-1/+4
* | Revert to 2010-12-03T11:48:24Z!jan.h.d@swipnet.se.Chong Yidong2010-12-032-4/+1
* | Remove EXPLICIT_SIGN_EXTEND.Andreas Schwab2010-12-032-1/+4
* | Merge changes from emacs-23 branchChong Yidong2010-11-271-3/+3
|\ \ | |/
| * bugtracker: REALLY correct locations of bzr *.conf files.Eli Zaretskii2010-11-221-1/+1
| * bugtracker: Correct locations of bzr *.conf files.Eli Zaretskii2010-11-211-2/+2
* | Merge from emacs-23Stefan Monnier2010-11-171-7/+32
|\ \ | |/
| * The `fixes' attribute does show in `bzr log'.Eli Zaretskii2010-11-121-4/+4
| * Expand and clarify the description of bugtracker setting for bzr.Eli Zaretskii2010-11-121-1/+24
| * Comments related to `bzr commit --fixes'.Glenn Morris2010-11-091-2/+4
| * Fix typos in docstrings, comments and ChangeLogs.Juanma Barranquero2010-10-131-1/+1
* | Notes about elpa.gnu.org for maintainers.Chong Yidong2010-11-041-0/+42
* | * admin/notes/bugtracker: Mention "found".Glenn Morris2010-10-301-0/+8
* | * admin/make-tarball.txt: Misc updates.Glenn Morris2010-10-211-13/+11
* | Move nextstep/DEV-NOTES to admin/notes/nextstep.Glenn Morris2010-10-112-0/+163
* | * configure.in (AC_OUTPUT): Remove doc/emacs/emacsver.texi.Glenn Morris2010-10-092-0/+7
* | Set the version number in the texinfo manuals using configure.Glenn Morris2010-10-082-21/+4