Import upstream version 12.10.4

1 files changed, 48 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 59cdff4..4f5e0c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,53 @@
 # Generated by Makefile. Do not edit.
 
+2012-10-03  Charles Kerr  <charles.kerr@canonical.com>
+
+	12.10.4
+
+2012-10-01  Ted Gould  <ted@gould.cx>
+
+	Remove the custom menu type for the restart entry. Fixes: https://bugs.launchpad.net/bugs/1058148. Approved by Charles Kerr, Lars Uebernickel.
+
+2012-09-28  Ted Gould  <ted@gould.cx>
+
+	Drop the defines
+
+2012-09-28  Ted Gould  <ted@gould.cx>
+
+	Make the restart item a normal one
+
+2012-09-28  Ted Gould  <ted@gould.cx>
+
+	Removing handling for the restart item type
+
+2012-09-28  Ted Gould  <ted@gould.cx>
+
+	Attaching bug
+
+2012-10-01  Ted Gould  <ted@gould.cx>
+
+	Move UPower settings init until after the items are created. Approved by Charles Kerr, Lars Uebernickel.
+
+2012-09-28  Ted Gould  <ted@gould.cx>
+
+	Move the upower init to after the items are created
+
+2012-10-01  Ted Gould  <ted@gould.cx>
+
+	Add more files to be ignored. Approved by Charles Kerr, Lars Uebernickel.
+
+2012-09-28  Ted Gould  <ted@gould.cx>
+
+	Tarballs now have multiple numbers in the revision
+
+2012-09-28  Ted Gould  <ted@gould.cx>
+
+	Ignoring the test service
+
+2012-09-28  Ted Gould  <ted@gould.cx>
+
+	Ignoring the generated dbus source files
+
 2012-09-19  Charles Kerr  <charles.kerr@canonical.com>
 
 	12.10.3