Merge lp:~logan/ubuntu-gnome-default-settings/eog-override into lp:ubuntu-gnome-default-settings

Proposed by Logan Rosen on 2015-05-21
Status: Merged
Merge reported by: Mathieu Trudel-Lapierre
Merged at revision: not available
Proposed branch: lp:~logan/ubuntu-gnome-default-settings/eog-override
Merge into: lp:ubuntu-gnome-default-settings
Diff against target: 26 lines (+7/-1)
2 files modified
debian/changelog (+7/-0)
debian/ubuntu-gnome-default-settings.gsettings-override (+0/-1)
To merge this branch: bzr merge lp:~logan/ubuntu-gnome-default-settings/eog-override
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre 2015-05-21 Approve on 2015-10-20
Review via email: mp+259707@code.launchpad.net
To post a comment you must log in.
32. By Logan Rosen on 2015-05-21

mark as unreleased; my mistake

Mathieu Trudel-Lapierre (cyphermox) wrote :

Already merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-03-10 22:19:24 +0000
3+++ debian/changelog 2015-05-21 00:17:45 +0000
4@@ -1,3 +1,10 @@
5+ubuntu-gnome-default-settings (15.04.6) UNRELEASED; urgency=medium
6+
7+ * Remove external-editor key override, as it no longer exists in eog
8+ (LP: #1439220).
9+
10+ -- Logan Rosen <logan@ubuntu.com> Wed, 20 May 2015 20:03:01 -0400
11+
12 ubuntu-gnome-default-settings (15.04.5) vivid; urgency=medium
13
14 * Add override for locksreen background uri
15
16=== modified file 'debian/ubuntu-gnome-default-settings.gsettings-override'
17--- debian/ubuntu-gnome-default-settings.gsettings-override 2015-03-10 22:19:24 +0000
18+++ debian/ubuntu-gnome-default-settings.gsettings-override 2015-05-21 00:17:45 +0000
19@@ -44,7 +44,6 @@
20 titlebar-font='Cantarell Bold 11'
21
22 [org.gnome.eog.ui]
23-external-editor='shotwell-viewer.desktop'
24 sidebar=false
25
26 [org.gnome.Empathy.conversation]

Subscribers

People subscribed via source and target branches