[cogl/msvc-support: 10/11] Merge branch 'master' into msvc-support

[Chun-wei Fan <fanchunwei src gnome org>]

commit 6118197c2771d63ad7e0dea3a152b46f8fb0b232
Merge: af7065d 9414871
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Jul 5 10:22:26 2011 +0800

    Merge branch 'master' into msvc-support

 README.in                                          |    2 +-
 cogl/Makefile.am                                   |    2 -
 cogl/cogl-framebuffer.c                            |    8 +-
 cogl/cogl-framebuffer.h                            |   98 ++
 cogl/cogl-matrix-mesa.c                            | 1738 -------------------
 cogl/cogl-matrix-mesa.h                            |  231 ---
 cogl/cogl-matrix-private.h                         |    2 +-
 cogl/cogl-matrix.c                                 | 1833 +++++++++++++++++---
 cogl/cogl-matrix.h                                 |   12 +
 cogl/cogl.c                                        |    8 +-
 cogl/cogl.h                                        |   52 -
 doc/reference/cogl-2.0-experimental/Makefile.am    |    1 -
 .../cogl-2.0-experimental/cogl-sections.txt        |   50 +-
 doc/reference/cogl/cogl-sections.txt               |    1 +
 14 files changed, 1769 insertions(+), 2269 deletions(-)
---