]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from emacs--unicode--0
authorMiles Bader <miles@gnu.org>
Sun, 4 Mar 2007 01:05:11 +0000 (01:05 +0000)
committerMiles Bader <miles@gnu.org>
Sun, 4 Mar 2007 01:05:11 +0000 (01:05 +0000)
Patches applied:

 * emacs--devo--0  (patch 638-652)

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

 * emacs--unicode--0  (patch 177-179)

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

 * gnus--rel--5.10  (patch 202)

   - Update from CVS

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

1  2 
configure
configure.in
src/ChangeLog.unicode
src/macterm.c
src/w32fns.c
src/w32term.c
src/xfaces.c
src/xterm.c

diff --cc configure
Simple merge
diff --cc configure.in
Simple merge
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/xfaces.c
Simple merge
diff --cc src/xterm.c
Simple merge