diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2011-11-08 10:14:25 +0000 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2011-11-08 10:14:25 +0000 |
| commit | 4c3e8544f70c9b949934d741655e0874a1cc86c6 (patch) | |
| tree | 1aac93127c06d0cf16567cf3d9c31b16a2fb39da | |
| parent | 8158b3db0272bd604fd17de6b870994877628b65 (diff) | |
| parent | 18e48707de894057f30936ca86cddd304da4e48f (diff) | |
Merge branch 'telepathy-mission-control-5.10'
Conflicts:
configure.ac
| -rw-r--r-- | NEWS | 12 | ||||
| -rw-r--r-- | data/im.telepathy.MissionControl.FromEmpathy.gschema.xml | 8 |
2 files changed, 12 insertions, 8 deletions
@@ -1,3 +1,15 @@ +telepathy-mission-control 5.10.1 (2011-11-08) +============================================= + +The “Why would i want a debugger? I don't know. Why do you want a face?” +release. + +Fixes: + +• An unnecessary enum definition, which conflicted with the one provided + by Empathy, has been removed from the GSettings schema. (Thanks, + ioni.) + telepathy-mission-control 5.10.0 (2011-11-07) ============================================= diff --git a/data/im.telepathy.MissionControl.FromEmpathy.gschema.xml b/data/im.telepathy.MissionControl.FromEmpathy.gschema.xml index ad5f595a..80fa88f5 100644 --- a/data/im.telepathy.MissionControl.FromEmpathy.gschema.xml +++ b/data/im.telepathy.MissionControl.FromEmpathy.gschema.xml @@ -1,12 +1,4 @@ <schemalist> - - <enum id="position"> - <value nick="top-left" value="1"/> - <value nick="top-right" value="2"/> - <value nick="bottom-left" value="3"/> - <value nick="bottom-right" value="4"/> - </enum> - <!-- sic: we are aliasing dconf key paths from Empathy's schema --> <schema id="im.telepathy.MissionControl.FromEmpathy" path="/org/gnome/empathy/"> <key name="use-conn" type="b"> |