aboutsummaryrefslogtreecommitdiffstats
path: root/admin
Commit message (Expand)AuthorAgeFilesLines
* * admin/notes/bzr: Tiny addition.Glenn Morris2011-02-281-0/+2
* * admin/notes/bzr: Small updates.Glenn Morris2011-02-231-0/+8
* * admin/notes/bzr: More details about merging ChangeLogs.Glenn Morris2011-02-221-1/+4
* Merge from emacs-23; up to 2010-06-02T00:10:[email protected].Glenn Morris2011-02-222-1/+5
|\
| * admin/notes/bugtracker (bugtracker_debbugs_url): Fix typo.Juanma Barranquero2011-02-222-1/+5
* | Add comments about fixing dates in merged ChangeLogs.Glenn Morris2011-02-222-3/+9
* | Merge: Import crypto/md5 and stdint modules from gnulib.Paul Eggert2011-02-201-3/+1
|\ \
| * | Import crypto/md5 module from gnulib.Paul Eggert2011-02-181-3/+1
* | | Initial version of fix for the MS-DOS build, not yet tested.Eli Zaretskii2011-02-192-0/+8
|/ /
* | Import getloadavg module from gnulib.Paul Eggert2011-02-153-7/+6
* | * admin/notes/bzr: Add section on undoing a bzr remove.Glenn Morris2011-02-131-0/+24
* | * admin/notes/bzr: Mention the helpful changelog_merge plugin.Glenn Morris2011-02-121-0/+15
* | * admin/bzrmerge.el (bzrmerge-resolve): Fix bzr revert call.Glenn Morris2011-02-122-1/+7
* | * admin/notes/bugtracker: Small updates.Glenn Morris2011-02-081-0/+5
* | bzrmerge.el trivia.Glenn Morris2011-02-052-1/+15
* | bzrmerge.el trivia.Glenn Morris2011-02-022-11/+26
* | Fix the MS-Windows build broken by 2011-01-30T23:34:[email protected] an...Eli Zaretskii2011-01-312-2/+8
* | src/emacs.c now gets version number from configure.inPaul Eggert2011-01-313-5/+11
* | strftime: import from gnulibPaul Eggert2011-01-302-1/+5
* | Refill some long/short copyright headers.Glenn Morris2011-01-265-13/+6
* | Make it easier to control which revisions bzrmerge might skip.Glenn Morris2011-01-242-2/+12
* | Convert consecutive FSF copyright years to ranges.Glenn Morris2011-01-2421-30/+21
* | * 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
|/ /