diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:37 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:37 +0000 |
| commit | e6cce35311205b7c7e6e204cd034d5ad40150506 (patch) | |
| tree | 82d903ef1a1e45b162d5e50df3443ad3ef961e01 | |
| parent | 2525fbd9270fbc1f73b4baf9a8279f34455c3a79 (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/suntcx.man | 2 | ||||
| -rw-r--r-- | src/tcx.h | 2 | ||||
| -rw-r--r-- | src/tcx_cursor.c | 2 | ||||
| -rw-r--r-- | src/tcx_driver.c | 2 | ||||
| -rw-r--r-- | src/tcx_regs.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/man/suntcx.man b/man/suntcx.man index 06bf55c..82dc1bd 100644 --- a/man/suntcx.man +++ b/man/suntcx.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suntcx/suntcx.man,v 1.2 2001/01/27 18:20:54 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suntcx/suntcx.man,v 1.1 2001/01/24 00:06:31 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH SUNTCX __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/suntcx/tcx.h,v 1.2 2001/05/04 19:05:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx.h,v 1.1 2000/06/30 17:15:16 dawes Exp $ */ #ifndef TCX_H #define TCX_H diff --git a/src/tcx_cursor.c b/src/tcx_cursor.c index 61ec1d6..e49b70d 100644 --- a/src/tcx_cursor.c +++ b/src/tcx_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/suntcx/tcx_cursor.c,v 1.1 2000/06/30 17:15:16 dawes Exp $ */ +/* $XFree86:$ */ #include "tcx.h" diff --git a/src/tcx_driver.c b/src/tcx_driver.c index bca4a7a..3c156af 100644 --- a/src/tcx_driver.c +++ b/src/tcx_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/suntcx/tcx_driver.c,v 1.7 2003/10/30 17:37:12 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx_driver.c,v 1.6 2001/08/07 07:04:51 keithp Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/src/tcx_regs.h b/src/tcx_regs.h index 61e4b0a..9b9c00d 100644 --- a/src/tcx_regs.h +++ b/src/tcx_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/suntcx/tcx_regs.h,v 1.1 2000/06/30 17:15:17 dawes Exp $ */ +/* $XFree86:$ */ #ifndef TCX_REGS_H #define TCX_REGS_H |