summaryrefslogtreecommitdiff
path: root/capplets
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-10-18 00:41:22 +0200
committerStefano Karapetsas <[email protected]>2012-10-18 00:41:22 +0200
commit0d19a66abfe03ffcfaca0f2539a9c6758d99a823 (patch)
tree57b625468b37127897cfdfd3650fb2f7f05ba091 /capplets
parent49d65611edf1a28df001fef2fa9896919544729d (diff)
parente2acedc27aa5859db9f9450eb09290c366f35d26 (diff)
downloadmate-control-center-0d19a66abfe03ffcfaca0f2539a9c6758d99a823.tar.bz2
mate-control-center-0d19a66abfe03ffcfaca0f2539a9c6758d99a823.tar.xz
Merge branch 'master' of github.com:mate-desktop/mate-control-center
Diffstat (limited to 'capplets')
-rw-r--r--capplets/about-me/mate-about-me.c1
-rw-r--r--capplets/windows/mate-window-properties.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/capplets/about-me/mate-about-me.c b/capplets/about-me/mate-about-me.c
index 7e55d0ec..0ef9156f 100644
--- a/capplets/about-me/mate-about-me.c
+++ b/capplets/about-me/mate-about-me.c
@@ -25,7 +25,6 @@
#include <glib/gstdio.h>
#include <gio/gio.h>
-#include <mateconf/mateconf-client.h>
#include <unistd.h>
#include <libebook/e-book.h>
#include <dbus/dbus-glib-bindings.h>
diff --git a/capplets/windows/mate-window-properties.c b/capplets/windows/mate-window-properties.c
index 7912ee0f..d63789e9 100644
--- a/capplets/windows/mate-window-properties.c
+++ b/capplets/windows/mate-window-properties.c
@@ -33,7 +33,6 @@
#include <mate-wm-manager.h>
#include "capplet-util.h"
-#include "mateconf-property-editor.h"
typedef struct
{