[Pkg-maemo-commits] r296 ./hildon-desktop/debian: * Cleaned up merge mistake from earlier.

[Jonny Lamb]

------------------------------------------------------------
revno: 296
committer: Jonny Lamb <jonnylamb at jonnylamb.com>
branch nick: hildon-desktop
timestamp: Tue 2007-07-24 21:18:13 +0100
message:
  * Cleaned up merge mistake from earlier.
modified:
  debian/changelog
  libhildondesktop/hildon-home-area.c
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2007-07-24 17:03:12 +0000
+++ b/debian/changelog	2007-07-24 20:18:13 +0000
@@ -10,8 +10,9 @@
   * Bumped Standards-Version to 3.7.2.
   * Cleanup rules.
   * Added watch file.
+  * Cleaned up merge mistake from earlier.
 
- -- Jonny Lamb <jonnylamb at jonnylamb.com>  Tue, 24 Jul 2007 18:02:57 +0100
+ -- Jonny Lamb <jonnylamb at jonnylamb.com>  Tue, 24 Jul 2007 21:17:43 +0100
 
 hildon-desktop (1:0.0.24-1) sardine; urgency=low
 

=== modified file 'libhildondesktop/hildon-home-area.c'
--- a/libhildondesktop/hildon-home-area.c	2007-07-24 16:31:32 +0000
+++ b/libhildondesktop/hildon-home-area.c	2007-07-24 20:18:13 +0000
@@ -1976,7 +1976,6 @@
   gsize                 buffer_size;
   GError               *local_error = NULL;
   gint                  ret;
-  guint                  n_children, i;
   guint                 n_children, i;
   Window               *wchildren, root, parent;