xserver: Branch 'master'

[Alan Coopersmith]

 GL/symlink-mesa.sh |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

New commits:
diff-tree ca094684196886a4a1c10273049fae0705a3edc2 (from 28337cc1060bc08adef81c304dd9ed02d0a0e37b)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Fri Nov 10 18:02:05 2006 -0800

    Correct symlink-mesa.sh usage message

diff --git a/GL/symlink-mesa.sh b/GL/symlink-mesa.sh
index c14c683..9687ce8 100755
--- a/GL/symlink-mesa.sh
+++ b/GL/symlink-mesa.sh
@@ -289,9 +289,9 @@ action() {
 }
 
 usage() {
-    echo symlink.sh src-dir dst-dir
-    echo src-dir: the xc directory of the monolithic source tree
-    echo dst-dir: the modular source tree containing proto, app, lib, ...
+    echo symlink-mesa.sh src-dir dst-dir
+    echo src-dir: the Mesa source directory
+    echo dst-dir: the GL subdirectory of the Xserver modular tree
 }
 
 # Check commandline args