]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d5d8ca3) | patch
Clean up merge conflict.
authorJan Djärv <jan.h.d@swipnet.se>
Sat, 1 Nov 2014 20:06:49 +0000 (21:06 +0100)
committerJan Djärv <jan.h.d@swipnet.se>
Sat, 1 Nov 2014 20:06:49 +0000 (21:06 +0100)
commitbf7ded963c672f858c3b4c14d2cd8278b0d781c4
treeeed47f19f62d898a3a3a58029b8e9f3082c5e7d9tree | snapshot
parentd5d8ca30e5f481a32414c42bcc3b5a042061ff07commit | diff
Clean up merge conflict.

* macfont.m (macfont_draw):
* nsterm.m (ns_mouse_position, judge): Clean up merge conflict.
src/ChangeLog diff | blob | history
src/macfont.m diff | blob | history
src/nsterm.m diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.