Mercurial > emacs
changeset 109404:e93288477c43
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Sun, 13 Jun 2010 22:57:55 +0000 |
parents | 681cd08dc0f7 (diff) f2d0b93e668c (current diff) |
children | 6730a174eb2b |
files | lisp/add-log.el lisp/cvs-status.el lisp/diff-mode.el lisp/diff.el lisp/ediff-diff.el lisp/ediff-help.el lisp/ediff-hook.el lisp/ediff-init.el lisp/ediff-merg.el lisp/ediff-mult.el lisp/ediff-ptch.el lisp/ediff-util.el lisp/ediff-vers.el lisp/ediff-wind.el lisp/ediff.el lisp/emerge.el lisp/log-edit.el lisp/log-view.el lisp/pcvs-defs.el lisp/pcvs-info.el lisp/pcvs-parse.el lisp/pcvs-util.el lisp/pcvs.el lisp/smerge-mode.el lisp/vc-annotate.el lisp/vc-arch.el lisp/vc-bzr.el lisp/vc-cvs.el lisp/vc-dav.el lisp/vc-dir.el lisp/vc-dispatcher.el lisp/vc-git.el lisp/vc-hg.el lisp/vc-hooks.el lisp/vc-mtn.el lisp/vc-rcs.el lisp/vc-sccs.el lisp/vc-svn.el lisp/vc.el lisp/vc/add-log.el lisp/vc/cvs-status.el lisp/vc/diff-mode.el lisp/vc/diff.el lisp/vc/ediff-diff.el lisp/vc/ediff-help.el lisp/vc/ediff-hook.el lisp/vc/ediff-init.el lisp/vc/ediff-merg.el lisp/vc/ediff-mult.el lisp/vc/ediff-ptch.el lisp/vc/ediff-util.el lisp/vc/ediff-vers.el lisp/vc/ediff-wind.el lisp/vc/ediff.el lisp/vc/emerge.el lisp/vc/log-edit.el lisp/vc/log-view.el lisp/vc/pcvs-defs.el lisp/vc/pcvs-info.el lisp/vc/pcvs-parse.el lisp/vc/pcvs-util.el lisp/vc/pcvs.el lisp/vc/smerge-mode.el lisp/vc/vc-annotate.el lisp/vc/vc-arch.el lisp/vc/vc-bzr.el lisp/vc/vc-cvs.el lisp/vc/vc-dav.el lisp/vc/vc-dir.el lisp/vc/vc-dispatcher.el lisp/vc/vc-git.el lisp/vc/vc-hg.el lisp/vc/vc-hooks.el lisp/vc/vc-mtn.el lisp/vc/vc-rcs.el lisp/vc/vc-sccs.el lisp/vc/vc-svn.el lisp/vc/vc.el |
diffstat | 1 files changed, 0 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Sun Jun 13 21:15:45 2010 +0300 +++ b/.hgtags Sun Jun 13 22:57:55 2010 +0000 @@ -32,7 +32,6 @@ 1290d63e6ab3ab9e82f2fd0a35c436d05b2e0861 ttn-vms-21-2-B4 136de3bfa14feaa22a4f959b4273a6ba46a21f76 libc-960211 14a47b65c288d095f4b98a840ff8671eb8f893fe tmp_pcl_tag_131034C -14f1ff916f19fdbaa1ca42dc9dde418bba829d3e EMACS_PRETEST_23_1_95 1550283d0e53c078b71a91aadadd33ab575ac4ae EMACS_22_1 15c6663e567613de3e6f1a495c12a30402c2c32e zsh-merge-ognus-1 18f3cb26243f96e95636c2c9857f16bdb153dda7 before-miles-orphaned-changes @@ -563,7 +562,6 @@ 72276b334084264b708d0e34ad447735c4ce5e22 libc20x-970319 72276b334084264b708d0e34ad447735c4ce5e22 libc20x-970404 72276b334084264b708d0e34ad447735c4ce5e22 root-libc-2_0_x-branch -72f8f4f82b9d27158cd49fd93249f503a2d29228 EMACS_PRETEST_23_1_94 7361b2115a770c0597610e2c87c0a27de4fa66e0 libc-961121 73b00b4dd2a6a44d3e03aaf764c0c761f35a32e6 EMACS_PRETEST_21_0_93 75519a692473ba53cd5c01b411717dd3043e11cd libc_1_09 @@ -887,7 +885,6 @@ b9483b592728f369b212714efb929c5f9a2fcbb2 libc-960321 bfc0a609e15a1240a53e580cca2d37ca049e7399 libc-951206 bfc852aa5b34546929e12d73d920518010fd12bc EMACS_PRETEST_22_1_91 -bfc8980754ed5b8ba76061deadab49dc41e7d7dd EMACS_23_2 c17fd465ea95fc615961c63088385865705ca8a3 libc-970911 c17fd465ea95fc615961c63088385865705ca8a3 libc-970912 c17fd465ea95fc615961c63088385865705ca8a3 libc-970913 @@ -1006,7 +1003,6 @@ c17fd465ea95fc615961c63088385865705ca8a3 libc-980127 c17fd465ea95fc615961c63088385865705ca8a3 libc-980128 c296bfdefcc3e065cdbfe4820fad8bc45e8c824d EMACS_PRETEST_21_0_105 -c3a1d1b47790cdd266fa8dd5b560f94a981266de EMACS_PRETEST_23_1_96 c47ea87f3bd75650205a60bd22a77ac5c594ce15 libc-970715 c4bf2875d07244697fba32d82fda761b6d3c296d libc-970506 c4bf2875d07244697fba32d82fda761b6d3c296d libc-970507 @@ -1023,7 +1019,6 @@ d0e3ea40717c5b4a2d6c98104885828d69d1793f EMACS_23_1_BASE d1641e2dfc5bf66c0747230159fec66f382d8c47 Boehm-GC-base d2548396ceddd157578a78683d41a83f25b7c0f3 EMACS_PRETEST_23_0_92 -d4caa51ddfe29f3c5db72f3cf9ced08bf53b12cd EMACS_PRETEST_23_1_97 d5cbb3a06adcf5683a55d3aebcda44ed39699264 libc-970325 d5cbb3a06adcf5683a55d3aebcda44ed39699264 libc-970326 d5cbb3a06adcf5683a55d3aebcda44ed39699264 libc-970327