summaryrefslogtreecommitdiff
path: root/fb/fbscreen.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 19:54:30 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 19:54:30 +0000
commit2fb588620030ad393f8500d60e16144d59e4effe (patch)
tree07262cbe15a40e5aeae54f62751260f83243ab79 /fb/fbscreen.c
parent0664db19bf37f9dd69cca6adff4e238e310c3092 (diff)
Merging XORG-CURRENT into trunk
Diffstat (limited to 'fb/fbscreen.c')
-rw-r--r--fb/fbscreen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fb/fbscreen.c b/fb/fbscreen.c
index bdcc9d139..2a46b00be 100644
--- a/fb/fbscreen.c
+++ b/fb/fbscreen.c
@@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fbscreen.c,v 1.13 2001/05/29 04:54:09 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbscreen.c,v 1.11 2000/09/03 05:09:47 keithp Exp $ */
#include "fb.h"