[xorg-commit-diffs] xc CHANGELOG-RELEASE-1-TM,1.1.2.21,1.1.2.22

[Keith Packard]

Committed by: keithp


Index: CHANGELOG-RELEASE-1-TM
===================================================================
RCS file: /cvs/xorg/xc/Attic/CHANGELOG-RELEASE-1-TM,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -d -r1.1.2.21 -r1.1.2.22
--- a/CHANGELOG-RELEASE-1-TM	26 Mar 2004 19:54:39 -0000	1.1.2.21
+++ b/CHANGELOG-RELEASE-1-TM	26 Mar 2004 22:28:06 -0000	1.1.2.22
@@ -1,3 +1,7 @@
+31. Add new MANDEFS to cover XServerName, et al.  Move 
+    XCONFIGFILE XCONFIGDIR et al from xorg.tmpl to X11.tmpl
+    so they can be used in building non-server manual pages
+    (Keith Packard)
 30. Allow XF86Config as a fallback config file (Egbert Eich).
 29. Fixed more TM issues especially xterm, getconfig and some default files
     (Egbert Eich).
@@ -11,7 +15,6 @@
 24. Updated XDarwin's Japanese localization for X.Org release
     (Toshimitsu Tanaka).
 23. Fixed TM issues in XDarwin UI (Torrey T. Lyons).
->>>>>>> 1.1.2.20
 22. Fixed typo that prevented the changelog date to be set correctly in
     xf86Build.h (Egbert Eich).
 21. Fixing some occurances of hard coded version numbers in applications