diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-15 14:13:55 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-15 14:13:55 +0200 |
| commit | 1501699f035761714a1d4540d65a1afb7c567abe (patch) | |
| tree | 4dd4d15583d9d542a699833331f34ceb10bbd6c3 /libXaw/include/X11/Xaw/Box.h | |
| parent | 38c18d1733e4eb5cc560a34bfe2470e01a06205d (diff) | |
| parent | a33de30073bfa0ee1abba186dba9fa52cf0aa23a (diff) | |
| download | vcxsrv-1501699f035761714a1d4540d65a1afb7c567abe.tar.gz vcxsrv-1501699f035761714a1d4540d65a1afb7c567abe.tar.bz2 vcxsrv-1501699f035761714a1d4540d65a1afb7c567abe.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
freetype/src/raster/ftraster.c
openssl/Makefile
Diffstat (limited to 'libXaw/include/X11/Xaw/Box.h')
| -rw-r--r-- | libXaw/include/X11/Xaw/Box.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libXaw/include/X11/Xaw/Box.h b/libXaw/include/X11/Xaw/Box.h index 19e9a6573..9eb1884d9 100644 --- a/libXaw/include/X11/Xaw/Box.h +++ b/libXaw/include/X11/Xaw/Box.h @@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -63,11 +63,11 @@ SOFTWARE. borderWidth BorderWidth Dimension 1 destroyCallback Callback Pointer NULL displayList DisplayList XawDisplayList* NULL - hSpace HSpace Dimension 4 + hSpace HSpace Dimension 4 height Height Dimension 0 mappedWhenManaged MappedWhenManaged Boolean True orientation Orientation XtOrientation vertical - vSpace VSpace Dimension 4 + vSpace VSpace Dimension 4 width Width Dimension 0 x Position Position 0 y Position Position 0 @@ -83,7 +83,7 @@ SOFTWARE. #ifndef XawNdisplayList #define XawNdisplayList "displayList" #endif - + #ifndef XawCDisplayList #define XawCDisplayList "DisplayList" #endif |