summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authormuesli4 <[email protected]>2013-04-10 15:49:44 +0200
committermuesli4 <[email protected]>2013-04-10 15:49:44 +0200
commit9201a7cebc456d2e3ce98bd478f75d0c2b223d70 (patch)
tree53a6d40d40e594e71ecc861c705f48cbe53fbc49 /data
parentec3bedb24f64944c0874dec793ba1ea9cb1b777b (diff)
parentf4a927c268231fdd6b5a333d0c547b46a11af858 (diff)
downloadmate-panel-9201a7cebc456d2e3ce98bd478f75d0c2b223d70.tar.bz2
mate-panel-9201a7cebc456d2e3ce98bd478f75d0c2b223d70.tar.xz
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'data')
-rw-r--r--data/mate-panel.convert2
1 files changed, 0 insertions, 2 deletions
diff --git a/data/mate-panel.convert b/data/mate-panel.convert
index 48a236e5..93dcc7cd 100644
--- a/data/mate-panel.convert
+++ b/data/mate-panel.convert
@@ -2,8 +2,6 @@
enable-program-list = /apps/panel/general/enable_program_list
show-program-list = /apps/panel/general/show_program_list
enable-autocompletion = /apps/panel/general/enable_autocompletion
-toplevel-id-list = /apps/panel/general/toplevel_id_list
-object-id-list = /apps/panel/general/object_id_list
tooltips-enabled = /apps/panel/global/tooltips_enabled
enable-animations = /apps/panel/global/enable_animations
drawer-autoclose = /apps/panel/global/drawer_autoclose