diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:06 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:06 +0000 |
| commit | c7dc29e5d64a7fc308874512321f43c194ac11e2 (patch) | |
| tree | bf762e3b3e7b1005e15ea61c21c547daee34e9a2 | |
| parent | b62b2b4b4cd80f05e48c634d16e05bed76f80607 (diff) | |
Merging XORG-CURRENT into trunksco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_903XORG-6_8_99_902XORG-6_8_99_901XORG-6_8_99_900XORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_16XORG-6_8_99_15XORG-6_8_99_14XORG-6_8_99_13XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEXORG-6_8-branch
| -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_ |