]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from emacs--unicode--0
authorMiles Bader <miles@gnu.org>
Wed, 25 Jul 2007 05:46:36 +0000 (05:46 +0000)
committerMiles Bader <miles@gnu.org>
Wed, 25 Jul 2007 05:46:36 +0000 (05:46 +0000)
Patches applied:

 * emacs--devo--0  (patch 814-823)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 59-69)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * emacs--unicode--0  (patch 232-235)

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

 * gnus--rel--5.10  (patch 237-238)

   - Update from CVS

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

1  2 
src/ChangeLog.unicode
src/xdisp.c
src/xfns.c
src/xterm.c
src/xterm.h

Simple merge
diff --cc src/xdisp.c
Simple merge
diff --cc src/xfns.c
Simple merge
diff --cc src/xterm.c
Simple merge
diff --cc src/xterm.h
Simple merge