Module Name: xsrc
Committed By: wiz
Date: Mon Jul 20 08:33:18 UTC 2015
Modified Files:
xsrc/external/mit/xf86-video-ast/dist/src: ast_accel.c
Log Message:
Remove merge artifact.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-ast/dist/src/ast_accel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-ast/dist/src/ast_accel.c
diff -u xsrc/external/mit/xf86-video-ast/dist/src/ast_accel.c:1.3 xsrc/external/mit/xf86-video-ast/dist/src/ast_accel.c:1.4
--- xsrc/external/mit/xf86-video-ast/dist/src/ast_accel.c:1.3 Mon Jul 20 00:10:28 2015
+++ xsrc/external/mit/xf86-video-ast/dist/src/ast_accel.c Mon Jul 20 08:33:18 2015
@@ -54,8 +54,6 @@
#include "ast.h"
#include "ast_2dtool.h"
-extern UCHAR *pjRequestCMDQ(ASTRecPtr pAST, ULONG ulDataLen);
-
#ifdef Accel_2D
#ifdef HAVE_XAA_H
