summaryrefslogtreecommitdiff
path: root/fb/fbgc.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/fbgc.c
parent0664db19bf37f9dd69cca6adff4e238e310c3092 (diff)
Merging XORG-CURRENT into trunk
Diffstat (limited to 'fb/fbgc.c')
-rw-r--r--fb/fbgc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fb/fbgc.c b/fb/fbgc.c
index 1e9eb5aa3..8cd08503d 100644
--- a/fb/fbgc.c
+++ b/fb/fbgc.c
@@ -21,7 +21,8 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.15 2003/12/18 15:25:41 alanh Exp $ */
+/* $XdotOrg: xc/programs/Xserver/fb/fbgc.c,v 1.15 2003/12/18 15:25:41 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.14 2003/12/18 15:22:32 alanh Exp $ */
#include "fb.h"
#ifdef IN_MODULE