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 | dbc4ab662f67ce0cf1ea877cac01a5e0ea6dab0c (patch) | |
| tree | 5223f1298c113aa369868410109fd6ae01c12cb7 | |
| parent | d5e296f691669aecc98097984a922048bf89f7a3 (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/suncg3.man | 2 | ||||
| -rw-r--r-- | src/cg3.h | 2 | ||||
| -rw-r--r-- | src/cg3_driver.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/man/suncg3.man b/man/suncg3.man index 8c1c8f1..cdc4ecc 100644 --- a/man/suncg3.man +++ b/man/suncg3.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/suncg3.man,v 1.2 2001/01/27 18:20:54 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/suncg3.man,v 1.1 2001/01/24 00:06:29 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH SUNCG3 __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/suncg3/cg3.h,v 1.1 2000/06/30 17:15:15 dawes Exp $ */ +/* $XFree86:$ */ #ifndef CG3_H #define CG3_H diff --git a/src/cg3_driver.c b/src/cg3_driver.c index dd5ef49..8bf3815 100644 --- a/src/cg3_driver.c +++ b/src/cg3_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/suncg3/cg3_driver.c,v 1.5 2003/10/30 17:37:12 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/cg3_driver.c,v 1.4 2001/05/16 06:48:10 keithp Exp $ */ #define PSZ 8 #include "xf86.h" |