[gnome-shell: 4/4] Merge branch 'bug588050-doc-textures'

[Colin Walters <walters src gnome org>]

commit 001af727276c24d57afb5527d6ee172f4f9c2322
Merge: 9d594d7... 5d067ec...
Author: Colin Walters <walters verbum org>
Date:   Mon Jul 13 16:24:55 2009 -0400

    Merge branch 'bug588050-doc-textures'

 js/misc/docInfo.js        |   96 ++++++++++++++------
 js/ui/docDisplay.js       |   15 +--
 src/shell-global.c        |   68 --------------
 src/shell-global.h        |    2 -
 src/shell-texture-cache.c |  225 +++++++++++++++++++++++++++++++++++++++++++--
 src/shell-texture-cache.h |   11 ++
 6 files changed, 301 insertions(+), 116 deletions(-)
---