xserver: Branch 'master'

[Alan Coopersmith]

 hw/xfree86/common/xf86Init.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 031b009ea678809bf1ddca883c2082b304c408c9 (from c0e91777a9874fe2cd9a7e9180263f512c1e8f8d)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Fri Jul 13 14:54:45 2007 -0700

    Use %S instead of %s for strftime seconds when printing build time

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index d20a271..d098e13 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1731,7 +1731,7 @@ xf86PrintBanner()
     t.tm_sec = BUILD_TIME % 100;
     t.tm_min = (BUILD_TIME / 100) % 100;
     t.tm_hour = (BUILD_TIME / 10000) % 100;
-    if (strftime(buf, sizeof(buf), "%d %B %Y  %I:%M:%s%p", &t))
+    if (strftime(buf, sizeof(buf), "%d %B %Y  %I:%M:%S%p", &t))
        ErrorF("Build Date: %s\n", buf);
 #else
     if (strftime(buf, sizeof(buf), "%d %B %Y", &t))