diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:52 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:52 +0000 |
| commit | bd01a8fc8f645eb7a869d9441de156937e9b87bd (patch) | |
| tree | 9f717550900242db173e265a993c1689a8d126d6 /syncstr.h | |
| parent | 7e018a8e4a0f8519e0fca19c5a70b9bb4bacd402 (diff) | |
| download | xorg-proto-xextproto-bd01a8fc8f645eb7a869d9441de156937e9b87bd.tar.gz | |
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-BASEXORG-CURRENTDAMAGE-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 'syncstr.h')
| -rw-r--r-- | syncstr.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -48,7 +48,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/include/extensions/syncstr.h,v 1.4 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86: xc/include/extensions/syncstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */ #ifndef _SYNCSTR_H_ #define _SYNCSTR_H_ |