comparison src/fringe.c @ 53900:5d607f751ba3

Resolve CVS conflicts
author Miles Bader <miles@gnu.org>
date Mon, 09 Feb 2004 12:42:04 +0000
parents e3771c262410
children 4dd0e0a7fd9e
comparison
equal deleted inserted replaced
53899:e45e1fbbe83e 53900:5d607f751ba3
1314 1314
1315 #endif 1315 #endif
1316 1316
1317 #endif /* HAVE_WINDOW_SYSTEM */ 1317 #endif /* HAVE_WINDOW_SYSTEM */
1318 1318
1319 /* arch-tag: 04596920-43eb-473d-b319-82712338162d
1320 (do not change this comment) */