Indicator Date and Time

Merge lp:~jjardon/indicator-datetime/remove_libunique into lp:indicator-datetime/0.3

  1. remove_libunique
  2. Merge into trunk
Proposed by Javier Jardón
Status: Merged
Approved by: Ted Gould
Approved revision: 140
Merged at revision: 142
Proposed branch: lp:~jjardon/indicator-datetime/remove_libunique
Merge into: lp:indicator-datetime/0.3
Diff against target: 22 lines (+0/-2)
2 files modified
configure.ac (+0/-1)
src/datetime-prefs.c (+0/-1)
To merge this branch: bzr merge lp:~jjardon/indicator-datetime/remove_libunique
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+78240@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'configure.ac'
--- configure.ac 2011-09-29 20:27:52 +0000
+++ configure.ac 2011-10-05 12:12:17 +0000
@@ -105,7 +105,6 @@
105105
106PKG_CHECK_MODULES(PREF, gio-2.0 >= $GIO_REQUIRED_VERSION106PKG_CHECK_MODULES(PREF, gio-2.0 >= $GIO_REQUIRED_VERSION
107 gtk+-3.0 >= $GTK3_REQUIRED_VERSION107 gtk+-3.0 >= $GTK3_REQUIRED_VERSION
108 unique-3.0
109 json-glib-1.0108 json-glib-1.0
110 libgnome-control-center109 libgnome-control-center
111 polkit-gobject-1)110 polkit-gobject-1)
112111
=== modified file 'src/datetime-prefs.c'
--- src/datetime-prefs.c 2011-09-09 09:47:20 +0000
+++ src/datetime-prefs.c 2011-10-05 12:12:17 +0000
@@ -32,7 +32,6 @@
32#include <glib/gi18n-lib.h>32#include <glib/gi18n-lib.h>
33#include <gdk/gdkkeysyms.h>33#include <gdk/gdkkeysyms.h>
34#include <gtk/gtk.h>34#include <gtk/gtk.h>
35#include <unique/unique.h>
36#include <polkit/polkit.h>35#include <polkit/polkit.h>
37#include <libgnome-control-center/cc-panel.h>36#include <libgnome-control-center/cc-panel.h>
3837

Subscribers

People subscribed via source and target branches