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/Panner.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/Panner.h')
-rw-r--r-- | libXaw/include/X11/Xaw/Panner.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libXaw/include/X11/Xaw/Panner.h b/libXaw/include/X11/Xaw/Panner.h index 02482922f..dd376027e 100644 --- a/libXaw/include/X11/Xaw/Panner.h +++ b/libXaw/include/X11/Xaw/Panner.h @@ -32,16 +32,16 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xaw/Reports.h> /***************************************************************************** - * + * * Panner Widget (subclass of Simple) - * + * * This widget is used to represent navigation in a 2d coordinate system - * + * * Resources: - * + * * Name Class Type Default * ---- ----- ---- ------- - * + * * allowOff AllowOff Boolean FALSE * background Background Pixel XtDefaultBackground * backgroundStipple BackgroundStipple String NULL @@ -60,7 +60,7 @@ in this Software without prior written authorization from The Open Group. * sliderY SliderY Position 0 * sliderWidth SliderWidth Dimension 0 * sliderHeight SliderHeight Dimension 0 - * + * *****************************************************************************/ #ifndef _XtStringDefs_h_ |