From 7072b3f6ed599e16cd355fe77ab85253765bc904 Mon Sep 17 00:00:00 2001
From: Deron Johnson <deron.johnson@sun.com>
Date: Thu, 17 Feb 2005 22:44:32 +0000
Subject: Joined with branch XORG-6_8_2.

---
 defs.ent | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/defs.ent b/defs.ent
index b672771..baec2e5 100644
--- a/defs.ent
+++ b/defs.ent
@@ -2,25 +2,27 @@
 
 <!-- shared entity definitions for the XFree86 documentation -->
 
-<!-- XFree86 version string -->
+<!-- Xorg version string -->
 <!ENTITY majorvers CDATA "6">
-<!ENTITY reldate CDATA "8 September 2004">
-<!ENTITY relvers CDATA "6.8">
-<!ENTITY prevrelvers CDATA "6.7">
-<!ENTITY fullrelvers CDATA "6.8.0">
-<!ENTITY prevfullrelvers CDATA "6.7.0">
+<!ENTITY reldate CDATA "9 February 2005">
+<!ENTITY relvers CDATA "6.8.2">
+<!ENTITY lastfullrelvers CDATA "6.8">
+<!ENTITY prevrelvers CDATA "6.8.1">
+<!ENTITY fullrelvers CDATA "6.8.2">
+<!ENTITY prevfullrelvers CDATA "6.8.0">
 <!ENTITY nextrelvers CDATA "7.0">
 <!ENTITY nextfullrelvers CDATA "7.0.0">
-<!ENTITY nextfullreldate CDATA "early 2005">
-<!ENTITY nextupdrelvers CDATA "6.8.1">
+<!ENTITY nextfullreldate CDATA "mid-2005">
+<!ENTITY nextupdrelvers CDATA "6.8.3">
 
 <!ENTITY srcvers CDATA "440">
-<!ENTITY prevsrcvers CDATA "660">
+<!ENTITY prevsrcvers CDATA "680">
 <!ENTITY fullsrcvers CDATA "440">
-<!ENTITY prevfullsrcvers CDATA "660">
+<!ENTITY prevfullsrcvers CDATA "680">
 <!ENTITY whichfullrel CDATA "eighth">
-<!ENTITY whichupdaterel CDATA "none">
-<!ENTITY reltag CDATA "XORG-6_8_0">
+<!ENTITY whichxorgrel CDATA "fourth">
+<!ENTITY whichupdaterel CDATA "second">
+<!ENTITY reltag CDATA "XORG-6_8_2">
 <!ENTITY relbranchtag CDATA "XORG-6_8-branch">
 <!ENTITY rcnum CDATA "0">
 
-- 
cgit v1.2.3