diff options
author | Egbert Eich <eich@suse.de> | 2004-03-04 17:46:24 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:46:24 +0000 |
commit | 0bdc639a56193b84ce9c5b85173b332fd8c81a8c (patch) | |
tree | bf762e3b3e7b1005e15ea61c21c547daee34e9a2 | |
parent | 2d332eaef52d0a64475f790c0e9cadc51bae1200 (diff) |
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadxo-6_7_0XPRINT_BEGINXPRINT_BASEXORG-TM-CYGWIN-MERGEXORG-TM-CYGWIN-LAST-MERGEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-CLOSEDXORG-RELEASE-1-TM-BASEXORG-RELEASE-1-STSF-FORKXORG-RELEASE-1-MERGEXORG-CYGWIN-MERGEXORG-CYGWIN-LAST-MERGEXORG-6_7_0IPv6-REVIEW-BASEXPRINTXORG-RELEASE-1-TMXORG-RELEASE-1-STSFXORG-RELEASE-1IPv6-REVIEW
a changed license. There was only one change which happened to be from
me (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_ |