[california/wip/725783-time: 6/7] Merge branch 'master' into wip/725783-time



commit d4e053869d2b8c0dda9473f88c6ed54407dc7a21
Merge: 55cba36 f5280d5
Author: Jim Nelson <jim yorba org>
Date:   Thu Jul 31 17:09:37 2014 -0700

    Merge branch 'master' into wip/725783-time

 THANKS                                      |    1 +
 po/es.po                                    |  350 ++++++++++++++++++++------
 po/hu.po                                    |  364 +++++++++++++++++++++------
 src/application/california-application.vala |    1 +
 src/host/host-create-update-event.vala      |    6 +-
 src/host/host-quick-create-event.vala       |    9 +
 src/rc/quick-create-event.ui                |   22 ++-
 7 files changed, 599 insertions(+), 154 deletions(-)
---


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