xserver-xorg-video-apm: Changes to 'upstream-unstable'
.cvsignore | 19 -------------------
.gitignore | 20 ++++++++++++++++++++
man/apm.man | 6 +++---
src/apm_cursor.c | 1 -
4 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit 5c471bae5933a3e915d8aba2dbf7c4f68c3086b7
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Mar 1 17:46:28 2007 -0500
Remove useless mfb.h include.
diff --git a/src/apm_cursor.c b/src/apm_cursor.c
index ea21ac2..14dbc62 100644
--- a/src/apm_cursor.c
+++ b/src/apm_cursor.c
@@ -13,7 +13,6 @@
#include "scrnintstr.h"
#include "servermd.h"
#include "windowstr.h"
-#include "mfb.h"
#include "mipointer.h"
#include "apm.h"
commit 3419d02714e4d10fa267b427af012de81c447a23
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Mar 1 10:40:39 2007 -0800
renamed: .cvsignore -> .gitignore
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index fb1befd..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-Makefile
-Makefile.in
-*.la
-*.lo
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2df4a8d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,20 @@
+Makefile
+Makefile.in
+*.la
+*.lo
+aclocal.m4
+autom4te.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1
+*~
commit a56ca8d06b4286d8c4e4188e6056eff00a2209f5
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Mar 1 10:40:15 2007 -0800
Replace references to XFree86/XF86Config in man page
diff --git a/man/apm.man b/man/apm.man
index cb206c1..739c658 100644
--- a/man/apm.man
+++ b/man/apm.man
@@ -14,7 +14,7 @@ apm \- Alliance ProMotion video driver
.fi
.SH DESCRIPTION
.B apm
-is an XFree86 driver for Alliance ProMotion video cards. The driver
+is an __xservername__ driver for Alliance ProMotion video cards. The driver
is accelerated for supported hardware/depth combination. It supports
framebuffer depths of 8, 15, 16, 24 and 32 bits. For 6420, 6422, AT24,
AT3D and AT25, all depths are fully accelerated except 24 bpp for which
@@ -35,7 +35,7 @@ ProMotion chipsets
.TP 12
.B AT25
.SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
details. This section only covers configuration details specific to this
driver.
.PP
@@ -101,6 +101,6 @@ Force the software cursor. Default: off.
.BI "Option \*qShadowFB\*q \*q" boolean \*q
Enable or disable use of the shadow framebuffer layer. Default: off.
.SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Authors include: ...
Reply to: