comparison oldXMenu/Internal.c @ 112228:417b1e4d63cd

Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 14 Jan 2011 12:18:41 -0500
parents 5cc91198ffb2 376148b31b5e
children ef719132ddfa
comparison
equal deleted inserted replaced
112227:07e52ed69b5d 112228:417b1e4d63cd
2 2
3 #include "copyright.h" 3 #include "copyright.h"
4 4
5 /* 5 /*
6 Copyright (C) 1993, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 6 Copyright (C) 1993, 1996, 2001, 2002, 2003, 2004, 2005, 2006,
7 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 7 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
8 8
9 This program is free software: you can redistribute it and/or modify 9 This program is free software: you can redistribute it and/or modify
10 it under the terms of the GNU General Public License as published by 10 it under the terms of the GNU General Public License as published by
11 the Free Software Foundation, either version 3 of the License, or 11 the Free Software Foundation, either version 3 of the License, or
12 (at your option) any later version. 12 (at your option) any later version.