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 | 5f8c90d3430243cd87c81a4eeb0759fa71cdfb1f (patch) | |
tree | bf762e3b3e7b1005e15ea61c21c547daee34e9a2 | |
parent | 2d332eaef52d0a64475f790c0e9cadc51bae1200 (diff) | |
download | xorg-proto-recordproto-XORG-CURRENT-premerge-release-1.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-CURRENTXACE-SELINUXDAMAGE-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).
-rw-r--r-- | record.h | 2 | ||||
-rw-r--r-- | recordstr.h | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -21,7 +21,7 @@ $Xorg: record.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. **************************************************************************/ -/* $XFree86: xc/include/extensions/record.h,v 1.2 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86$ */ #ifndef _RECORD_H_ #define _RECORD_H_ diff --git a/recordstr.h b/recordstr.h index 37b5eec..246d34f 100644 --- a/recordstr.h +++ b/recordstr.h @@ -24,7 +24,7 @@ static char sccsid[ ] = "@(#) recordstr.h 1.5 6/5/95 12:37:44"; * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. **************************************************************************/ -/* $XFree86: xc/include/extensions/recordstr.h,v 1.2 2001/08/01 00:44:35 tsi Exp $ */ +/* $XFree86$ */ #ifndef _RECORDSTR_H_ #define _RECORDSTR_H_ |