HCoop Git - bpt/emacs.git/commit

HCoop / bpt / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6630df2 fa6fa1a)

author	Eli Zaretskii <eliz@gnu.org>
	Sat, 7 Dec 2013 17:21:57 +0000 (19:21 +0200)
committer	Eli Zaretskii <eliz@gnu.org>
	Sat, 7 Dec 2013 17:21:57 +0000 (19:21 +0200)
commit	ce1d7b61f12dcc1b67535b68d9b0655b45fcadb6
tree	881d03f4f486933482cd2e3851184cd3b172ef1b	tree \| snapshot (tar.gz zip)
parent	6630df25238c5a1efa2bc6a0fa7889782e8c91b5	commit \| diff
parent	fa6fa1a1773f255b5efbe52a743b017f4908a6cb	commit \| diff

Merge from trunk.

etc/NEWS	diff1 \|	diff2 \|	blob \| history
nt/inc/ms-w32.h	diff1 \|	diff2 \|	blob \| history
src/emacs.c	diff1 \|	diff2 \|	blob \| history
src/fileio.c	diff1 \|	diff2 \|	blob \| history
src/gnutls.c	diff1 \|	diff2 \|	blob \| history
src/image.c	diff1 \|	diff2 \|	blob \| history
src/w32fns.c	diff1 \|	diff2 \|	blob \| history
src/w32proc.c	diff1 \|	diff2 \|	blob \| history
src/w32term.c	diff1 \|	diff2 \|	blob \| history

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