diff options
| author | Paul Eggert | 2011-01-17 11:01:01 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-17 11:01:01 -0800 |
| commit | a3e44e793796153ff1534be9c74fcab50b45de30 (patch) | |
| tree | 863d5db087c8e034c96d06ea955515f4d3f3d0a3 /src/coding.h | |
| parent | 7f818df9420a1320539f7e3e633003573a570413 (diff) | |
| parent | 721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff) | |
| download | emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip | |
Merge from mainline.
Diffstat (limited to 'src/coding.h')
| -rw-r--r-- | src/coding.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/coding.h b/src/coding.h index 0ddc08d139c..e424ab72fa4 100644 --- a/src/coding.h +++ b/src/coding.h | |||
| @@ -830,5 +830,3 @@ extern int emacs_mule_string_char (unsigned char *); | |||
| 830 | 830 | ||
| 831 | #endif /* EMACS_CODING_H */ | 831 | #endif /* EMACS_CODING_H */ |
| 832 | 832 | ||
| 833 | /* arch-tag: 2bc3b4fa-6870-4f64-8135-b962b2d290e4 | ||
| 834 | (do not change this comment) */ | ||