[clutter/msvc-support: 7/7] Merge branch 'master' into msvc-support

From: Chun-wei Fan <fanchunwei src gnome org>
To: commits-list gnome org
Cc:
Subject: [clutter/msvc-support: 7/7] Merge branch 'master' into msvc-support
Date: Thu, 16 Jun 2011 08:49:14 +0000 (UTC)

commit 0c31bcb93993fb4f33c96a9e714f42551349400b
Merge: 3fe7275 d90c849
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Jun 16 16:49:00 2011 +0800

    Merge branch 'master' into msvc-support

 .gitignore                          |    2 +-
 clutter/clutter-stage-window.c      |   17 +++++++++----
 clutter/cogl/clutter-backend-cogl.h |    4 +--
 clutter/cogl/clutter-egl-headers.h  |   46 +++++++++++++++++++++++++++++++++++
 clutter/cogl/clutter-glx.h          |   46 +++++++++++++++++++++++++++++++++++
 clutter/cogl/clutter-stage-cogl.c   |   29 ----------------------
 6 files changed, 106 insertions(+), 38 deletions(-)
---

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]