[clutter/msvc-support: 14/14] Merge branch 'master' into msvc-support
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/msvc-support: 14/14] Merge branch 'master' into msvc-support
- Date: Tue, 16 Aug 2011 01:54:20 +0000 (UTC)
commit a64a22879d8f6bcb45041ebb038239e47fc6adc4
Merge: d7f05c5 98b3834
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Tue Aug 16 09:54:04 2011 +0800
Merge branch 'master' into msvc-support
COPYING | 20 +-
NEWS | 78 ++
clutter/clutter-actor.c | 16 +-
configure.ac | 4 +-
doc/reference/cally/Makefile.am | 4 +-
doc/reference/cally/cally-docs.xml.in | 10 +
doc/reference/cally/cally-sections.txt | 2 +
doc/reference/clutter/clutter-sections.txt | 2 +-
po/ca.po | 220 +++---
po/ca valencia po | 220 +++---
po/clutter-1.0.pot | 220 +++---
po/cs.po | 1104 ++++++++++++++--------------
po/de.po | 220 +++---
po/eo.po | 218 +++---
po/es.po | 1111 ++++++++++++++--------------
po/fr.po | 219 +++---
po/gl.po | 220 +++---
po/id.po | 218 +++---
po/it.po | 219 +++---
po/nb.po | 219 +++---
po/nl.po | 219 +++---
po/pa.po | 218 +++---
po/pl.po | 220 +++---
po/sl.po | 220 +++---
po/sv.po | 218 +++---
po/te.po | 218 +++---
po/uk.po | 221 +++---
po/zh_CN.po | 219 +++---
po/zh_TW.po | 219 +++---
tests/conform/test-conform-main.c | 5 +-
tests/interactive/test-actors.c | 3 +
tests/micro-bench/Makefile.am | 6 +-
tests/performance/Makefile.am | 4 +-
33 files changed, 3391 insertions(+), 3143 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
