diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:12 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:12 +0000 |
| commit | 505fe2ba307e9270627ca7f3cb6b4e1dbacc327b (patch) | |
| tree | ad19dfe52ca3f84a6f669acac195d296ed38ad08 /os/access.c | |
| parent | 1b22db1ebcf1ba98ca8519fa38210e275373f8f6 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.
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 'os/access.c')
| -rw-r--r-- | os/access.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/os/access.c b/os/access.c index 14b61839c..53dede0ed 100644 --- a/os/access.c +++ b/os/access.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/os/access.c,v 3.54 2004/01/03 17:38:39 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/os/access.c,v 3.53 2004/01/02 18:23:19 tsi Exp $ */ #ifdef WIN32 #include <X11/Xwinsock.h> |