[cogl/msvc-support: 4/4] Merge branch 'master' into msvc-support
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/msvc-support: 4/4] Merge branch 'master' into msvc-support
- Date: Thu, 20 Oct 2011 07:43:12 +0000 (UTC)
commit 460048d8e60e9a71bd36008e81a7f8af7f179f20
Merge: 18296ee 4701526
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Oct 20 16:00:46 2011 +0800
Merge branch 'master' into msvc-support
cogl/winsys/cogl-winsys-egl.c | 6 +-
examples/Makefile.am | 1 +
po/nb.po | 317 ++++++++++++++++++++++++++++++++++++++++-
3 files changed, 314 insertions(+), 10 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]