]> git.eshelyaron.com Git - emacs.git/commit
fix conflicts
authorJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 05:59:34 +0000 (07:59 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 05:59:34 +0000 (07:59 +0200)
commita41d9dcfc950458c081f832606dac2081d14c8ae
tree74c0943a6a5cc7691c8357db34d432d279be533b
parent46b1dc2856fcfd6222f5320a511fcf0863c9c04c
fix conflicts
src/emacsgtkfixed.c
src/window.c