diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:38 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:38 +0000 |
| commit | 54ec87ac9a45f940b51ca459181bee9d5706ede8 (patch) | |
| tree | f4a34ecb2260a4ea49a051970ea09160bd12b8c9 /popup.c | |
| parent | 2b61b0c6fc3f2fd6b0b859b9160dfde92c021f5f (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASE
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (Egbert Eich).
Diffstat (limited to 'popup.c')
| -rw-r--r-- | popup.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xsm/popup.c,v 1.5 2001/12/14 20:02:26 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/popup.c,v 1.4 2001/01/17 23:46:30 dawes Exp $ */ #include "xsm.h" #include <X11/Shell.h> |