HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
declare smobs in alloc.c
[bpt/emacs.git]
/
admin
/
alloc-colors.c
diff --git
a/admin/alloc-colors.c
b/admin/alloc-colors.c
index
c336d80
..
a63e1ba
100644
(file)
--- a/
admin/alloc-colors.c
+++ b/
admin/alloc-colors.c
@@
-1,13
+1,13
@@
/* Allocate X colors. Used for testing with dense colormaps.
/* Allocate X colors. Used for testing with dense colormaps.
- Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
-
Free Software Foundation, Inc.
+
+
Copyright (C) 2001-2014
Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
-GNU Emacs is free software
;
you can redistribute it and/or modify
+GNU Emacs is free software
:
you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
-the Free Software Foundation
; either version 2, or (at your option)
-any later version.
+the Free Software Foundation
, either version 3 of the License, or
+
(at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,9
+15,8
@@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
+
#include <X11/Xlib.h>
#include <stdio.h>
#include <X11/Xlib.h>
#include <stdio.h>
@@
-41,7
+40,7
@@
void
usage (const char *progname)
{
fprintf (stderr, "Usage %s options\n", progname);
usage (const char *progname)
{
fprintf (stderr, "Usage %s options\n", progname);
- fprintf (stderr, "-n NCOLORS all
co
ate NCOLORS colors\n");
+ fprintf (stderr, "-n NCOLORS all
oc
ate NCOLORS colors\n");
exit (1);
}
exit (1);
}
@@
-112,6
+111,3
@@
main (int argc, char **argv)
XCloseDisplay (dpy);
return 0;
}
XCloseDisplay (dpy);
return 0;
}
-
-/* arch-tag: f1be90ac-5b70-43c2-835e-5a6432a25145
- (do not change this comment) */