merge master
commitf61f2029fc4bf91e9e6fa32570209cf4446a103c
authorJoakim Verona <joakim@verona.se>
Thu, 26 Feb 2015 13:43:51 +0000 (26 14:43 +0100)
committerJoakim Verona <joakim@verona.se>
Thu, 26 Feb 2015 13:43:51 +0000 (26 14:43 +0100)
treec98381e3a67b9ee1432f9150a424c0fc42203560
parent8cffeb5e4d548398c5c8c26e191e6f237c47cf2b
parentd8e9122115b5ffcec342c841b81cb2d2b8217e4b
merge master
src/dispextern.h
src/emacs.c