[california/wip/725785-create-recurring: 10/11] Merge branch 'master' into wip/725785-create-recurring
- From: Jim Nelson <jnelson src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [california/wip/725785-create-recurring: 10/11] Merge branch 'master' into wip/725785-create-recurring
- Date: Fri, 13 Jun 2014 23:21:06 +0000 (UTC)
commit 4e6c5d805cb21598b716eff3beb12801dff970db
Merge: 9b2dd00 b8921cc
Author: Jim Nelson <jim yorba org>
Date: Fri Jun 13 15:34:14 2014 -0700
Merge branch 'master' into wip/725785-create-recurring
configure.ac | 4 +
data/org.yorba.california.gschema.xml | 8 +
po/el.po | 391 ++++++++++++++++-----------
po/he.po | 213 ++++++++-------
po/pl.po | 34 ++--
src/Makefile.am | 4 +
src/application/california-application.vala | 13 +-
src/application/california-settings.vala | 70 +++++
src/calendar/calendar-first-of-week.vala | 10 +-
src/calendar/calendar-system.vala | 35 +++
src/host/host-main-window.vala | 19 +-
src/rc/window-menu.interface | 6 -
src/toolkit/toolkit-stack-model.vala | 8 +
src/view/month/month-cell.vala | 8 +-
src/view/month/month-controller.vala | 30 ++-
src/view/month/month-grid.vala | 23 +--
src/view/view-controllable.vala | 6 -
src/view/week/week-all-day-cell.vala | 8 +-
src/view/week/week-controller.vala | 28 +--
19 files changed, 569 insertions(+), 349 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]