From 0874ae23a16946781dd517cfdb011c691ad0b581 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 5 May 2010 09:43:03 +0000
Subject: svn merge -r571:HEAD "^/branches/released" .

---
 xorg-server/hw/xfree86/doc/sgml/DESIGN.sgml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'xorg-server/hw/xfree86/doc/sgml')

diff --git a/xorg-server/hw/xfree86/doc/sgml/DESIGN.sgml b/xorg-server/hw/xfree86/doc/sgml/DESIGN.sgml
index 5beff653f..e95df7999 100644
--- a/xorg-server/hw/xfree86/doc/sgml/DESIGN.sgml
+++ b/xorg-server/hw/xfree86/doc/sgml/DESIGN.sgml
@@ -1,5 +1,5 @@
 <!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
- <!ENTITY % defs SYSTEM "defs.ent"> %defs;
+ <!ENTITY % defs SYSTEM "X11/defs.ent"> %defs;
  <!-- config file keyword markup -->
  <!ENTITY s.key STARTTAG "bf">
  <!ENTITY e.key ENDTAG "bf">
-- 
cgit v1.2.3