From bb010c63b54c58a6dc63f86d6c0338d9502328bc Mon Sep 17 00:00:00 2001
From: Michael Terry <mike@mterry.name>
Date: Mon, 28 Feb 2011 08:07:15 -0500
Subject: Import upstream version 0.1.95

---
 ChangeLog | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 155 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index d60e604..8d0e694 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,160 @@
 # Generated by Makefile. Do not edit.
 
+2011-02-28  David Barth  <david.barth@canonical.com>
+
+	bumping release number
+
+2011-02-28  David Barth  <david.barth@canonical.com>
+
+	karl's remote cal support patch; and support for settings of the new prefs dialog
+
+2011-02-25  Michael Terry  <mike@mterry.name>
+
+	add in some fixes from karl's branch
+
+2011-02-25  karl-qdh  <karl@qdh.org.uk>
+
+	Updated to free errors just in case(tm) at dbarths request
+	shortened the update time to 5 minutes for calendars
+
+2011-02-25  karl-qdh  <karl@qdh.org.uk>
+
+	Get ido calendar and dbusmenu the right way around
+
+2011-02-25  Michael Terry  <mike@mterry.name>
+
+	merge with trunk
+
+2011-02-25  karl-qdh  <karl@qdh.org.uk>
+
+	Fixing up indicator-datetime
+	* Config options
+	* Calendar update signals from calendar widget - should update appointments/marks not working at present
+
+2011-02-25  David Barth  <david.barth@canonical.com>
+
+	merging in mterry's branch with the new preferences dialog
+
+2011-02-25  Michael Terry  <mike@mterry.name>
+
+	fix a couple memory leaks noted by MacSlow
+
+2011-02-25  Michael Terry  <mike@mterry.name>
+
+	remove week-start preference
+
+2011-02-25  Michael Terry  <mike@mterry.name>
+
+	add missing olsen_map.png
+
+2011-02-24  Michael Terry  <mike@mterry.name>
+
+	make sure user always sees new model from geonames when we get it
+
+2011-02-24  Michael Terry  <mike@mterry.name>
+
+	don't update locations dialog's times when editing
+
+2011-02-24  Michael Terry  <mike@mterry.name>
+
+	have location column expand
+
+2011-02-23  Michael Terry  <mike@mterry.name>
+
+	don't have the map draw a highlight if no zone selected
+
+2011-02-23  Michael Terry  <mike@mterry.name>
+
+	add geonames watermark
+
+2011-02-23  Michael Terry  <mike@mterry.name>
+
+	show admin1 and country in completion dropdown
+
+2011-02-23  Michael Terry  <mike@mterry.name>
+
+	skip duplicate completions
+
+2011-02-23  Michael Terry  <mike@mterry.name>
+
+	some cleanup; when map changes, update entry too
+
+2011-02-23  Michael Terry  <mike@mterry.name>
+
+	disable clicking on locations; use pretty zone names in indicator
+
+2011-02-23  Michael Terry  <mike@mterry.name>
+
+	make map larger
+
+2011-02-23  Michael Terry  <mike@mterry.name>
+
+	hook show-locations up
+
+2011-02-23  Michael Terry  <mike@mterry.name>
+
+	whoops, uncomment polkit bits
+
+2011-02-23  Michael Terry  <mike@mterry.name>
+
+	add week-start controls and settings
+
+2011-02-23  Michael Terry  <mike@mterry.name>
+
+	grab timezone names from geomaps; flesh out support for timezone completion in main map and locations dialog; show times in locations dialog
+
+2011-02-22  Michael Terry  <mike@mterry.name>
+
+	beginnings of completion support
+
+2011-02-22  Michael Terry  <mike@mterry.name>
+
+	make remove button insensitive if nothing selected
+
+2011-02-22  Michael Terry  <mike@mterry.name>
+
+	make locations dialog editable
+
+2011-02-22  Michael Terry  <mike@mterry.name>
+
+	drop some unused code from libmap
+
+2011-02-22  Michael Terry  <mike@mterry.name>
+
+	add initial timezone map implementation, borrowed from gnome-control-center
+
+2011-02-22  Michael Terry  <mike@mterry.name>
+
+	re-sync with trunk
+
+2011-02-18  Michael Terry  <mike@mterry.name>
+
+	start of locations dialog
+
+2011-02-18  Michael Terry  <mike@mterry.name>
+
+	mark prefs dialog as translatable
+
+2011-02-18  Michael Terry  <mike@mterry.name>
+
+	make manual date/time fields work
+
+2011-02-18  Michael Terry  <mike@mterry.name>
+
+	add polkit support and use new gnome-settings-daemon ntp-setting support
+
+2011-02-17  Michael Terry  <mike@mterry.name>
+
+	first pass at preferences dialog
+
+2011-02-17  Ted Gould  <ted@gould.cx>
+
+	Merging trunk?  not sure how we got out of sync.  Fixed.
+
+2011-02-17  Ted Gould  <ted@gould.cx>
+
+	Adding in timezone support and more calendar support
+
 2011-02-17  Ted Gould  <ted@gould.cx>
 
 	0.1.94
-- 
cgit v1.2.3