merge master
commit5e2255017323c54feeaaee220175d7761a3b6ed1
authorJoakim Verona <joakim@verona.se>
Fri, 16 Jan 2015 21:29:10 +0000 (16 22:29 +0100)
committerJoakim Verona <joakim@verona.se>
Fri, 16 Jan 2015 21:29:10 +0000 (16 22:29 +0100)
tree3f843af60b826b63e12482301ce20745a95ede3e
parentb64675500decba1c707bc5d5c6d57f633934778f
parent78e6ccc4a5006272b14f352e459a6d3bf52ed07b
merge master
configure.ac
src/lisp.h
src/window.c
src/xdisp.c