[california/wip/732029-gtk-312: 3/4] Merge branch 'master' into wip/732029-gtk-312
- From: Jim Nelson <jnelson src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [california/wip/732029-gtk-312: 3/4] Merge branch 'master' into wip/732029-gtk-312
- Date: Fri, 18 Jul 2014 20:27:42 +0000 (UTC)
commit 7a626354ee7e4e5acda94f0f04d3fdb396e444b3
Merge: 5cf6aca c22c724
Author: Jim Nelson <jim yorba org>
Date: Thu Jul 17 17:33:56 2014 -0700
Merge branch 'master' into wip/732029-gtk-312
.../activator-google-authenticating-pane.vala | 13 +-
src/host/host-show-event.vala | 66 ++++--
src/rc/show-event.ui | 226 ++------------------
src/util/util-scheduled.vala | 18 ++
4 files changed, 86 insertions(+), 237 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]