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



commit b17010b350420cecec5da01df26014b894f2814e
Merge: f541140 9efcb8a
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Sep 14 16:45:12 2011 +0800

    Merge branch 'master' into msvc-support

 NEWS                                               |   43 +
 build/clutter-build-setup.sh                       |    3 +-
 build/jhbuildrc-clutter                            |    2 +-
 clutter/cally/cally-util.c                         |    5 +-
 clutter/clutter-actor.c                            |   57 +-
 clutter/clutter-alpha.c                            |    4 +-
 clutter/clutter-animatable.c                       |    8 +-
 clutter/clutter-animation.c                        |    7 +-
 clutter/clutter-box.c                              |    2 +-
 clutter/clutter-child-meta.h                       |    9 +-
 clutter/clutter-effect.c                           |   10 +-
 clutter/clutter-gesture-action.c                   |    6 +-
 clutter/clutter-main.c                             |    6 +-
 clutter/clutter-stage.c                            |    4 +-
 clutter/clutter-text.c                             |    2 +-
 clutter/cogl/clutter-stage-cogl.c                  |    7 +-
 configure.ac                                       |    2 +-
 doc/HACKING                                        |   20 +-
 doc/reference/clutter/subclassing-ClutterActor.xml |   88 +-
 doc/reference/cogl-2.0/Makefile.am                 |  142 --
 doc/reference/cogl-2.0/blend-strings.xml           |  129 --
 doc/reference/cogl-2.0/cogl-docs.xml.in            |  194 --
 doc/reference/cogl-2.0/cogl-sections.txt           |  484 -----
 doc/reference/cogl-2.0/cogl_ortho.png              |  Bin 12650 -> 0 bytes
 doc/reference/cogl-2.0/fill-rule-even-odd.png      |  Bin 3121 -> 0 bytes
 doc/reference/cogl-2.0/fill-rule-non-zero.png      |  Bin 3143 -> 0 bytes
 doc/reference/cogl-2.0/quad-indices-order.png      |  Bin 2620 -> 0 bytes
 doc/reference/cogl-2.0/quad-indices-triangles.png  |  Bin 8018 -> 0 bytes
 po/ast.po                                          | 2218 ++++++++++++++++++++
 po/ca.po                                           |  370 ++--
 po/ca valencia po                                  |  370 ++--
 po/clutter-1.0.pot                                 |  372 ++--
 po/cs.po                                           |  370 ++--
 po/da.po                                           | 2162 +++++++++++++++++++
 po/de.po                                           |  370 ++--
 po/en_GB.po                                        | 1110 +++++-----
 po/eo.po                                           |  370 ++--
 po/es.po                                           |  417 ++--
 po/fr.po                                           |  370 ++--
 po/gl.po                                           |  370 ++--
 po/hi.po                                           | 2172 +++++++++++++++++++
 po/id.po                                           | 1312 ++++++------
 po/it.po                                           |  370 ++--
 po/kn.po                                           |  370 ++--
 po/lt.po                                           | 2172 +++++++++++++++++++
 po/lv.po                                           | 1126 +++++-----
 po/nb.po                                           |  370 ++--
 po/nl.po                                           |  370 ++--
 po/or.po                                           | 1199 ++++++------
 po/pa.po                                           |  370 ++--
 po/pl.po                                           |  370 ++--
 po/pt_BR.po                                        | 1101 +++++-----
 po/ru.po                                           | 2195 +++++++++++++++++++
 po/sl.po                                           |  370 ++--
 po/sv.po                                           |  370 ++--
 po/te.po                                           |  370 ++--
 po/tr.po                                           | 2163 +++++++++++++++++++
 po/uk.po                                           |  370 ++--
 po/zh_CN.po                                        |  622 +++---
 po/zh_HK.po                                        |  370 ++--
 po/zh_TW.po                                        |  370 ++--
 61 files changed, 20351 insertions(+), 8254 deletions(-)
---



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