Merge from trunkold-branches/window-pub
commit1d00388aae9e39ceb8e520b5f227c21fdd219a20
authorMartin Rudalics <rudalics@gmx.at>
Mon, 6 Jun 2011 06:57:59 +0000 (6 08:57 +0200)
committerMartin Rudalics <rudalics@gmx.at>
Mon, 6 Jun 2011 06:57:59 +0000 (6 08:57 +0200)
tree0fae32c463f63162d608b9038dd63fe73b9dfb59
parent348f5121cd84ade8ce29d557e7f1215694027b05
parent4d09bcf621ec32e17fdb8dd2ea08344486f7aeef
Merge from trunk
lisp/ChangeLog
src/ChangeLog
src/xfns.c