xserver: Branch 'master'

[Keith Packard]

 fb/wfbrename.h |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5047810a4c20fab444b8c6eb146c55dcdb0d4219
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Wed Mar 6 09:40:28 2013 -0800

    fb: Rename wfbDestroyGlyphCache
    
    Renaming this function was missed in commit
    9cbcb5bd6a5360a128d15b77a02d8d3351f74366, so both libfb.so and libwfb.so define
    functions named fbDestroyGlyphCache.
    
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
    Reviewed-by: Søren Sandmann <ssp at redhat.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/fb/wfbrename.h b/fb/wfbrename.h
index 588440c..54d00d0 100644
--- a/fb/wfbrename.h
+++ b/fb/wfbrename.h
@@ -52,6 +52,7 @@
 #define fbCreatePixmap wfbCreatePixmap
 #define fbCreatePixmapBpp wfbCreatePixmapBpp
 #define fbCreateWindow wfbCreateWindow
+#define fbDestroyGlyphCache wfbDestroyGlyphCache
 #define fbDestroyPixmap wfbDestroyPixmap
 #define fbDestroyWindow wfbDestroyWindow
 #define fbDoCopy wfbDoCopy