[valencia/wip/gedit-3.12: 10/10] Merge branch 'master' into wip/gedit-3.12
- From: Jim Nelson <jnelson src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [valencia/wip/gedit-3.12: 10/10] Merge branch 'master' into wip/gedit-3.12
- Date: Wed, 3 Dec 2014 01:11:59 +0000 (UTC)
commit 147f7a6db9b83861ada88a6e1a6a48bac7848f98
Merge: 7429f71 48cca04
Author: Jim Nelson <jim yorba org>
Date: Tue Dec 2 17:11:26 2014 -0800
Merge branch 'master' into wip/gedit-3.12
.gitignore | 1 +
INSTALL | 11 ++++++-
Makefile | 16 ++++++++---
NEWS | 17 ++++++++++++
autocomplete.vala | 2 +-
program.vala | 73 +++++++++++++++++++++++++++++++++++++++++++++++++---
settings.vala | 35 +++++++++++++++++++++----
valencia.doap | 16 +++++------
valencia.vala | 14 ++++++++--
9 files changed, 155 insertions(+), 30 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]