diff options
author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:30:59 +0000 |
---|---|---|
committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:30:59 +0000 |
commit | 6eb7db68db7715843063fe8c31b059a4bc9ee7c7 (patch) | |
tree | ca35219617136e26e1d837cf90d89c4659620fa4 | |
parent | 6959f15f101c9d9cc3797f56eb5a30d901b0f9ca (diff) |
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGE
-rw-r--r-- | man/sunbw2.man | 2 | ||||
-rw-r--r-- | src/bw2.h | 2 | ||||
-rw-r--r-- | src/bw2_driver.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/man/sunbw2.man b/man/sunbw2.man index ac05ccf..8a50cd5 100644 --- a/man/sunbw2.man +++ b/man/sunbw2.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/sunbw2.man,v 1.2 2001/01/27 18:20:53 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/sunbw2.man,v 1.1 2001/01/24 00:06:28 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH SUNBW2 __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/sunbw2/bw2.h,v 1.1 2000/06/30 17:15:13 dawes Exp $ */ +/* $XFree86:$ */ #ifndef BW2_H #define BW2_H diff --git a/src/bw2_driver.c b/src/bw2_driver.c index 5888b0e..00dc62b 100644 --- a/src/bw2_driver.c +++ b/src/bw2_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/sunbw2/bw2_driver.c,v 1.4 2003/10/30 17:37:11 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/bw2_driver.c,v 1.3 2001/05/04 19:05:45 dawes Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" |