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/SimpleMenu.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/SimpleMenu.h')
| -rw-r--r-- | libXaw/include/X11/Xaw/SimpleMenu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libXaw/include/X11/Xaw/SimpleMenu.h b/libXaw/include/X11/Xaw/SimpleMenu.h index 633fb1771..79f7216ef 100644 --- a/libXaw/include/X11/Xaw/SimpleMenu.h +++ b/libXaw/include/X11/Xaw/SimpleMenu.h @@ -38,7 +38,7 @@ in this Software without prior written authorization from The Open Group. * Date: April 3, 1989 * * By: Chris D. Peterson - * MIT X Consortium + * MIT X Consortium * kit@expo.lcs.mit.edu */ |