Merge from trunk
authorDaniel Colascione <dancol@dancol.org>
Sun, 7 Oct 2012 22:31:58 +0000 (14:31 -0800)
committerDaniel Colascione <dancol@dancol.org>
Sun, 7 Oct 2012 22:31:58 +0000 (14:31 -0800)
commit36a305a723c63fd345be65c536c52fe9765c14be
treefb89d9e103552863214c60297a65320917109357
parent2ab329f3b5d52a39f0a45c3d9c129f1c19560142
parent795b1482a9e314cda32d62ac2988f573d359366e
Merge from trunk
36 files changed:
configure.ac
lisp/faces.el
lisp/international/mule-cmds.el
lisp/mouse.el
lisp/server.el
lisp/simple.el
lisp/startup.el
lisp/term/ns-win.el
src/Makefile.in
src/dispextern.h
src/emacs.c
src/font.h
src/fontset.c
src/frame.c
src/frame.h
src/image.c
src/keyboard.c
src/keyboard.h
src/menu.c
src/process.c
src/termhooks.h
src/unexw32.c
src/w32.c
src/w32.h
src/w32fns.c
src/w32heap.c
src/w32inevt.c
src/w32menu.c
src/w32proc.c
src/w32select.c
src/w32term.c
src/w32term.h
src/w32xfns.c
src/window.c
src/xdisp.c
src/xfaces.c