Merge from trunk

[bpt/emacs.git] / src / intervals.c

diff --git a/src/intervals.c b/src/intervals.c
index def63c4..ad46c17 100644 (file)
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -1,6 +1,5 @@
 /* Code for doing intervals.
-   Copyright (C) 1993, 1994, 1995, 1997, 1998, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+   Copyright (C) 1993-1995, 1997-1998, 2001-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -2565,5 +2564,3 @@ set_intervals_multibyte (int multi_flag)
                               BEG, BEG_BYTE, Z, Z_BYTE);
 }
 
-/* arch-tag: 3d402b60-083c-4271-b4a3-ebd9a74bfe27
-   (do not change this comment) */