]> git.eshelyaron.com Git - emacs.git/commit
fix conflicts
authorJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 05:32:27 +0000 (07:32 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 05:32:27 +0000 (07:32 +0200)
commitac845636437cfd96001525f7f090ec0dc336731e
tree2acf242c26504e03f1e5ba53d82358e775c36fdd
parent63dae8e97d343fd4ebfe3dc08f0e8dc932630a4c
parent93ef404dc95f947e1c48000a46968fd252781b9d
fix conflicts
src/emacsgtkfixed.c
src/emacsgtkfixed.h
src/window.c
src/xdisp.c