git.eshelyaron.com Git - emacs.git/commit

]> git.eshelyaron.com Git - emacs.git/commit

author	Joakim Verona <joakim@verona.se>
	Mon, 2 Feb 2015 19:16:12 +0000 (20:16 +0100)
committer	Joakim Verona <joakim@verona.se>
	Mon, 2 Feb 2015 19:16:12 +0000 (20:16 +0100)
commit	13251c01dc5ab28b60f544070583d7066fe66223
tree	88b08dd128cdf245e8806c5c937300f35189485f	tree \| snapshot
parent	92a8dec54ed3314ca06f40cd0c226c4267a160e8	commit \| diff

Revert "Revert changes installed by xwidgets merge"

This reverts commit 241260cc2819e5df254ad85953588b06388ade61.

Conflicts:
src/ChangeLog

32 files changed:

ChangeLog		diff \| blob \| history
README.xwidget	[new file with mode: 0644]	blob
configure.ac		diff \| blob \| history
etc/NEWS		diff \| blob \| history
lisp/ChangeLog		diff \| blob \| history
lisp/emacs-parallel/README.org	[new file with mode: 0644]	blob
lisp/emacs-parallel/parallel-remote.el	[new file with mode: 0644]	blob
lisp/emacs-parallel/parallel-xwidget.el	[new file with mode: 0644]	blob
lisp/emacs-parallel/parallel.el	[new file with mode: 0644]	blob
lisp/ldefs-boot.el		diff \| blob \| history
lisp/net/browse-url.el		diff \| blob \| history
lisp/xwidget.el	[new file with mode: 0644]	blob
src/ChangeLog		diff \| blob \| history
src/Makefile.in		diff \| blob \| history
src/buffer.c		diff \| blob \| history
src/dispextern.h		diff \| blob \| history
src/dispnew.c		diff \| blob \| history
src/emacs.c		diff \| blob \| history
src/emacsgtkfixed.c		diff \| blob \| history
src/emacsgtkfixed.h		diff \| blob \| history
src/keyboard.c		diff \| blob \| history
src/lisp.h		diff \| blob \| history
src/print.c		diff \| blob \| history
src/termhooks.h		diff \| blob \| history
src/window.c		diff \| blob \| history
src/xdisp.c		diff \| blob \| history
src/xterm.c		diff \| blob \| history
src/xwidget.c	[new file with mode: 0644]	blob
src/xwidget.h	[new file with mode: 0644]	blob
test/ChangeLog		diff \| blob \| history
test/automated/xwidget-tests.el	[new file with mode: 0644]	blob
test/xwidget-test-manual.el	[new file with mode: 0644]	blob

Unnamed repository; edit this file 'description' to name the repository.