diff options
| author | Ted Gould <ted@gould.cx> | 2010-07-12 15:51:03 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-07-12 15:51:03 -0500 |
| commit | 0a0f9d00f73c17ff7edbd84f60d2b800b9e2dc91 (patch) | |
| tree | de001a6d285e9fe4ae2b76ae6c089f508128d163 | |
| parent | df30f437fd80697d97544fafa43999a05debefb0 (diff) | |
| parent | 7e526de2df2ff20b44d1f4fbf9bada7075c2cd9c (diff) | |
| download | ayatana-indicator-datetime-0a0f9d00f73c17ff7edbd84f60d2b800b9e2dc91.tar.gz ayatana-indicator-datetime-0a0f9d00f73c17ff7edbd84f60d2b800b9e2dc91.tar.bz2 ayatana-indicator-datetime-0a0f9d00f73c17ff7edbd84f60d2b800b9e2dc91.zip | |
Update to trunk to resolve conflicts
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/datetime-service.c | 2 | ||||
| -rw-r--r-- | src/indicator-datetime.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index a741152..9bf0a3c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(indicator-datetime, 0.0.2, ted@canonical.com) +AC_INIT(indicator-datetime, 0.0.3, ted@canonical.com) AC_COPYRIGHT([Copyright 2009 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-datetime, 0.0.2) +AM_INIT_AUTOMAKE(indicator-datetime, 0.0.3) AM_MAINTAINER_MODE diff --git a/src/datetime-service.c b/src/datetime-service.c index 56d024e..2137065 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -1,5 +1,5 @@ /* -An indicator to show date and time information. +An indicator to time and date related information in the menubar. Copyright 2010 Canonical Ltd. diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c index cb33c75..6b32f1a 100644 --- a/src/indicator-datetime.c +++ b/src/indicator-datetime.c @@ -1,5 +1,5 @@ /* -An indicator to show date and time information. +An indicator to time and date related information in the menubar. Copyright 2010 Canonical Ltd. |