]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from emacs--unicode--0
authorMiles Bader <miles@gnu.org>
Tue, 17 Jul 2007 04:48:41 +0000 (04:48 +0000)
committerMiles Bader <miles@gnu.org>
Tue, 17 Jul 2007 04:48:41 +0000 (04:48 +0000)
Patches applied:

 * emacs--devo--0  (patch 793-802)

   - Update from CVS
   - Remove RCS keywords
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 42-50)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Gnus ChangeLog tweaks

 * emacs--unicode--0  (patch 220-223)

   - Update from CVS
   - Merge from emacs--devo--0

 * gnus--rel--5.10  (patch 229-232)

   - Merge from emacs--devo--0, emacs--rel--22
   - ChangeLog tweak
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode-xft--0--patch-64

13 files changed:
1  2 
ChangeLog.unicode
configure
configure.in
src/ChangeLog.unicode
src/config.in
src/dispextern.h
src/image.c
src/macterm.c
src/w32fns.c
src/w32term.c
src/xdisp.c
src/xfns.c
src/xmenu.c

Simple merge
diff --cc configure
Simple merge
diff --cc configure.in
Simple merge
Simple merge
diff --cc src/config.in
Simple merge
Simple merge
diff --cc src/image.c
Simple merge
diff --cc src/macterm.c
Simple merge
diff --cc src/w32fns.c
Simple merge
diff --cc src/w32term.c
Simple merge
diff --cc src/xdisp.c
Simple merge
diff --cc src/xfns.c
Simple merge
diff --cc src/xmenu.c
Simple merge