Mercurial > emacs
changeset 112337:256406bc04fe
Merge from mainline.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Mon, 17 Jan 2011 14:09:25 -0800 |
parents | 7e12e8b5864c (diff) 7e5855ddf3f2 (current diff) |
children | aee2f052ef17 |
files | |
diffstat | 1 files changed, 0 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Jan 17 16:18:00 2011 -0500 +++ b/.hgtags Mon Jan 17 14:09:25 2011 -0800 @@ -1,6 +1,5 @@ 00e54fde074a6a0bdb7ba0e6923fbb28f0f8dfe7 font-backend-base 02a6c15defdbca2a31c4f00ed75fa880457134c0 mh-e-7_85 -0534ddfdceeb2a664034367efc0872e318da9a6b EMACS_PRETEST_23_2_92 06552ba973ce8cd074ae30fb5e48ed2c955e0b1f libc-970827 06552ba973ce8cd074ae30fb5e48ed2c955e0b1f libc-970828 06552ba973ce8cd074ae30fb5e48ed2c955e0b1f libc-970829 @@ -329,7 +328,6 @@ 4d5237dec736125edb335336c2a78c48e193c57b libc-970728 4e108e81543a2cbc43dafbf21c40fc76d2a37587 EMACS_21_1_BASE 4f9e6148ce6a22d21cc97f05b7bd942902e5fb56 libc-961120 -5032326a2135c454179635e25edd646e4e06c48a EMACS_PRETEST_23_2_91 528ba99a1dd3868cc06e80e995af1506d8c80f7a EMACS_PRETEST_23_1_93 53eebdb81828714d3f61701fb32781516fbd9d16 zsh-sync-ognus-3 5479380913c9e36c2dd41acff09c421aa3a5de6e EMACS_PRETEST_22_0_96