Public Git Hosting - emacs.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: b121ef1 81e0cca)

commit	ba4502fe1465f7803beca3ae187e41f0b25bef10
author	Ted Zlatanov <tzz@lifelogs.com>
	Thu, 27 Nov 2014 02:31:11 +0000 (26 21:31 -0500)
committer	Ted Zlatanov <tzz@lifelogs.com>
	Thu, 27 Nov 2014 02:31:11 +0000 (26 21:31 -0500)
tree	de8bdc219eeeba72e1a8b271ac96234c3c5af447	tree \| snapshot (tar.gz zip)
parent	b121ef10f500c0377c2ce665e8ccd8b97a6aedfd	commit \| diff
parent	81e0cca7bbc99dbfda898a8aaab740ae121cf045	commit \| diff

Merge branch 'emacs-24'

Conflicts:
nt/addsection.c
nt/inc/ms-w32.h
src/w32.c

17 files changed:

.gitignore	diff1 \|	diff2 \|	blob \| history
ChangeLog	diff1 \|	diff2 \|	blob \| history
admin/CPP-DEFINES	diff1 \|	diff2 \|	blob \| history
admin/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/emacs/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/emacs/misc.texi	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/js.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/python.el	diff1 \|	diff2 \|	blob \| history
lisp/vc/vc-bzr.el	diff1 \|	diff2 \|	blob \| history
lisp/window.el	diff1 \|	diff2 \|	blob \| history
nt/ChangeLog	diff1 \|	diff2 \|	blob \| history
nt/inc/ms-w32.h	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/frame.c	diff1 \|	diff2 \|	blob \| history
src/w32.c	diff1 \|	diff2 \|	blob \| history
src/w32term.c	diff1 \|	diff2 \|	blob \| history

Emacs repository mirror