diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:17 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:17 +0000 |
| commit | e8a005881cad65292bd73a2ed8f7454ce9d461f0 (patch) | |
| tree | 4473b2c497e65c5d49f7a47642c4c711d54b3f8b /src/menus.h | |
| parent | 9071e4e92738e8eb23df35a2e58bce30ab59b4c9 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-XFIXES
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 'src/menus.h')
| -rw-r--r-- | src/menus.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/menus.h b/src/menus.h index 55e1a4c..6e8c31f 100644 --- a/src/menus.h +++ b/src/menus.h @@ -48,7 +48,7 @@ in this Software without prior written authorization from The Open Group. /** TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE **/ /** OR PERFORMANCE OF THIS SOFTWARE. **/ /*****************************************************************************/ -/* $XFree86: xc/programs/twm/menus.h,v 1.6 2001/12/14 20:01:09 dawes Exp $ */ +/* $XFree86: xc/programs/twm/menus.h,v 1.5 2001/08/27 21:11:40 dawes Exp $ */ /*********************************************************************** |