summaryrefslogtreecommitdiff
path: root/src/window.h
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-01-17 11:01:01 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2011-01-17 11:01:01 -0800
commita3e44e793796153ff1534be9c74fcab50b45de30 (patch)
tree863d5db087c8e034c96d06ea955515f4d3f3d0a3 /src/window.h
parent7f818df9420a1320539f7e3e633003573a570413 (diff)
parent721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff)
downloademacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz
emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.bz2
emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip
Merge from mainline.
Diffstat (limited to 'src/window.h')
-rw-r--r--src/window.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/window.h b/src/window.h
index 1143b6f094d..620c1b3392e 100644
--- a/src/window.h
+++ b/src/window.h
@@ -894,5 +894,3 @@ extern int window_box_text_cols (struct window *w);
#endif /* not WINDOW_H_INCLUDED */
-/* arch-tag: d4a6942f-e433-4ffe-ac10-2c3574f28577
- (do not change this comment) */