| commit | bf7ded963c672f858c3b4c14d2cd8278b0d781c4 | |
| author | Jan Djärv <jan.h.d@swipnet.se> | |
| Sat, 1 Nov 2014 20:06:49 +0000 (1 21:06 +0100) | ||
| committer | Jan Djärv <jan.h.d@swipnet.se> | |
| Sat, 1 Nov 2014 20:06:49 +0000 (1 21:06 +0100) | ||
| tree | eed47f19f62d898a3a3a58029b8e9f3082c5e7d9 | treesnapshot (tar.gz zip) |
| parent | d5d8ca30e5f481a32414c42bcc3b5a042061ff07 | commitdiff |
Clean up merge conflict.
* macfont.m (macfont_draw):
* nsterm.m (ns_mouse_position, judge): Clean up merge conflict.
* macfont.m (macfont_draw):
* nsterm.m (ns_mouse_position, judge): Clean up merge conflict.
| src/ChangeLog | diffblobblamehistory | |
| src/macfont.m | diffblobblamehistory | |
| src/nsterm.m | diffblobblamehistory |