diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:35 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:35 +0000 |
| commit | 11fa48fc4dbcfe4a7f6e8f6414b577604040f687 (patch) | |
| tree | af8c69987e60e31c3bf03e648cc3d4f2b0444aa4 | |
| parent | e1d9c9df4b1f0a2a0318e621e3838284ce49db30 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-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-- | man/suncg6.man | 2 | ||||
| -rw-r--r-- | src/cg6.h | 2 | ||||
| -rw-r--r-- | src/cg6_cursor.c | 2 | ||||
| -rw-r--r-- | src/cg6_driver.c | 2 | ||||
| -rw-r--r-- | src/cg6_regs.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/man/suncg6.man b/man/suncg6.man index b0dc5e8..491b68d 100644 --- a/man/suncg6.man +++ b/man/suncg6.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/suncg6.man,v 1.2 2001/01/27 18:20:54 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/suncg6.man,v 1.1 2001/01/24 00:06:29 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH SUNCG6 __drivermansuffix__ __vendorversion__ @@ -20,7 +20,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6.h,v 1.3 2001/05/04 19:05:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6.h,v 1.2 2000/06/30 17:15:15 dawes Exp $ */ #ifndef CG6_H #define CG6_H diff --git a/src/cg6_cursor.c b/src/cg6_cursor.c index 72a396f..31266e5 100644 --- a/src/cg6_cursor.c +++ b/src/cg6_cursor.c @@ -23,7 +23,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_cursor.c,v 1.1 2000/06/30 19:30:46 dawes Exp $ */ +/* $XFree86:$ */ #include "cg6.h" diff --git a/src/cg6_driver.c b/src/cg6_driver.c index a9619d2..c0cb0d7 100644 --- a/src/cg6_driver.c +++ b/src/cg6_driver.c @@ -20,7 +20,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_driver.c,v 1.8 2003/10/30 17:37:12 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_driver.c,v 1.7 2002/12/06 16:44:38 tsi Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/src/cg6_regs.h b/src/cg6_regs.h index f6f3f05..28178f7 100644 --- a/src/cg6_regs.h +++ b/src/cg6_regs.h @@ -20,7 +20,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_regs.h,v 1.1 2000/05/23 04:47:43 dawes Exp $ */ +/* $XFree86$ */ #ifndef CG6_REGS_H #define CG6_REGS_H |