Merge from trunk
commiteb75c0a33d6fa7b39ae12473c1bcd14976398d8d
authorMartin Rudalics <rudalics@gmx.at>
Sun, 27 Jun 2010 09:50:38 +0000 (27 11:50 +0200)
committerMartin Rudalics <rudalics@gmx.at>
Sun, 27 Jun 2010 09:50:38 +0000 (27 11:50 +0200)
treec3cf8eb7f88b7640c6fd78912213c4911ceef73d
parent6bebbe823d9b22778e11c80a0b7b818c25686bce
parent6431f2e619d1ce4cff097a3837f6b9e931f1f61a
Merge from trunk
lisp/ChangeLog
src/ChangeLog
src/frame.c
src/w32fns.c
src/xfns.c