Merge from ubuntu-desktop

1 files changed, 50 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index e69de29..989bb93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,50 @@
+# Generated by Makefile. Do not edit.
+
+2010-01-07  Ted Gould  <ted@gould.cx>
+
+	Adding the loadable indicator.
+
+2010-01-06  Ted Gould  <ted@gould.cx>
+
+	Building a simple menu.
+
+2010-01-05  Ted Gould  <ted@gould.cx>
+
+	Initalizing and disposing of the label and timer
+
+2010-01-05  Ted Gould  <ted@gould.cx>
+
+	Adding in a timer to update
+
+2010-01-05  Ted Gould  <ted@gould.cx>
+
+	Adding comments.
+
+2010-01-05  Ted Gould  <ted@gould.cx>
+
+	Updating the label with the time
+
+2010-01-04  Ted Gould  <ted@gould.cx>
+
+	Making a label
+
+2010-01-04  Ted Gould  <ted@gould.cx>
+
+	Linking in the get_label function
+
+2010-01-04  Ted Gould  <ted@gould.cx>
+
+	Adding in the indicator defines
+
+2010-01-04  Ted Gould  <ted@gould.cx>
+
+	The base object for the indicator
+
+2010-01-04  Ted Gould  <ted@gould.cx>
+
+	Building a very basic indicator.
+
+2010-01-04  Ted Gould  <ted@gould.cx>
+
+	Boot strap
+