diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-17 11:01:01 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-17 11:01:01 -0800 |
| commit | a3e44e793796153ff1534be9c74fcab50b45de30 (patch) | |
| tree | 863d5db087c8e034c96d06ea955515f4d3f3d0a3 /src/fontset.h | |
| parent | 7f818df9420a1320539f7e3e633003573a570413 (diff) | |
| parent | 721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff) | |
| download | emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.bz2 emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip | |
Merge from mainline.
Diffstat (limited to 'src/fontset.h')
| -rw-r--r-- | src/fontset.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/fontset.h b/src/fontset.h index 3ad4fc4ed05..15c81aa1850 100644 --- a/src/fontset.h +++ b/src/fontset.h @@ -60,5 +60,3 @@ extern int face_for_font (struct frame *, Lisp_Object, struct face *); #endif /* EMACS_FONTSET_H */ -/* arch-tag: c27cef7b-3cab-488a-8398-7a4daa96bb77 - (do not change this comment) */ |