HCoop Git - bpt/emacs.git/commit - src/w32term.h

HCoop / bpt / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 37a4dab a68089e)

author	Eli Zaretskii <eliz@gnu.org>
	Wed, 17 Oct 2012 21:07:59 +0000 (23:07 +0200)
committer	Eli Zaretskii <eliz@gnu.org>
	Wed, 17 Oct 2012 21:07:59 +0000 (23:07 +0200)
commit	8cd879af4a393715c1c7f44a174248e85f7810ab
tree	f0779e2a9c855ccba82628f6bcda43ef0d800ff3	tree \| snapshot (tar.gz zip)
parent	37a4dabe8aaa51e15cf63e43710ee4b8f35d434b	commit \| diff
parent	a68089e4a4dd41c9b838d82d1d96d971b01398c8	commit \| diff

Merge from trunk.

lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/alloc.c	diff1 \|	diff2 \|	blob \| history
src/lisp.h	diff1 \|	diff2 \|	blob \| history
src/makefile.w32-in	diff1 \|	diff2 \|	blob \| history
src/w32fns.c	diff1 \|	diff2 \|	blob \| history
src/w32proc.c	diff1 \|	diff2 \|	blob \| history
src/w32term.h	diff1 \|	diff2 \|	blob \| history

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