[SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (99eb5a3158f1d5d92a6bfcd17301a09b3be66424)
Eric Sandall
scm at sourcemage.org
Mon Apr 14 01:35:09 EDT 2008
GIT changes to devel-xorg-modular grimoire by Eric Sandall <sandalle at sourcemage.org>:
xorg-xserver/xorg-server/CONFIGURE | 2 +-
xorg-xserver/xorg-server/HISTORY | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 99eb5a3158f1d5d92a6bfcd17301a09b3be66424
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>
Revert "xorg-server: wtf is TLS, anyways?"
This reverts commit 5f0aaaabaa7be9c395cbebacaf5c403d9d93590f.
Andraž says it is not what I guessed it to be (and searching online just nets "TLS")
Conflicts:
xorg-xserver/xorg-server/HISTORY
diff --git a/xorg-xserver/xorg-server/CONFIGURE b/xorg-xserver/xorg-server/CONFIGURE
index 0cf90cc..7d4f999 100755
--- a/xorg-xserver/xorg-server/CONFIGURE
+++ b/xorg-xserver/xorg-server/CONFIGURE
@@ -60,7 +60,7 @@ config_query_option XORG_SERVER_OPTS \
"--disable-aiglx" &&
config_query_option XORG_SERVER_OPTS \
- "Build GLX with Transport Layer Security support?" \
+ "Build GLX with TLS support?" \
n \
"--enable-glx-tls" \
"--disable-glx-tls" &&
diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY
index 83676ea..771aa7c 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -3,8 +3,7 @@
Bug #13360
* CONFIGURE: Remove XWin option, only used for Cygwin anyways
Bug #13476
- * DEPENDS: TLS -> Transport Layer Security
- Depends on libxfont built with fontcache support (Bug #13374)
+ * DEPENDS: Depends on libxfont built with fontcache support (Bug #13374)
* BUILD: Disable XWin (Bug #13476)
2008-03-17 Eric Sandall <sandalle at sourcemage.org>
More information about the SM-Commit
mailing list