diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-05-22 06:23:14 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-05-22 06:23:14 +0800 |
| commit | cbaa9eb7432b11d9bd6cb38fe5ef027612720623 (patch) | |
| tree | 6a02c49c11cc58d98b9950543480eb9d554bf89a /plugins/groupwise-features | |
| parent | 84c2e3735ce6e4df88142e86446f9179b6e341e4 (diff) | |
| parent | 1f65552d0dd6e8635ef0926a0f750c4f0bd34230 (diff) | |
| download | gsoc2013-evolution-cbaa9eb7432b11d9bd6cb38fe5ef027612720623.tar gsoc2013-evolution-cbaa9eb7432b11d9bd6cb38fe5ef027612720623.tar.gz gsoc2013-evolution-cbaa9eb7432b11d9bd6cb38fe5ef027612720623.tar.bz2 gsoc2013-evolution-cbaa9eb7432b11d9bd6cb38fe5ef027612720623.tar.lz gsoc2013-evolution-cbaa9eb7432b11d9bd6cb38fe5ef027612720623.tar.xz gsoc2013-evolution-cbaa9eb7432b11d9bd6cb38fe5ef027612720623.tar.zst gsoc2013-evolution-cbaa9eb7432b11d9bd6cb38fe5ef027612720623.zip | |
Merge branch 'master' into kill-bonobo
Conflicts:
plugins/audio-inline/org-gnome-audio-inline.eplug.xml
plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml
plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml
plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml
plugins/select-one-source/org-gnome-select-one-source.eplug.xml
Diffstat (limited to 'plugins/groupwise-features')
| -rw-r--r-- | plugins/groupwise-features/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am index 53b0ab6948..42b68c58ec 100644 --- a/plugins/groupwise-features/Makefile.am +++ b/plugins/groupwise-features/Makefile.am @@ -59,7 +59,6 @@ glade_DATA = \ error_DATA = \ org-gnome-shared-folder.error \ - org-gnome-process-meeting.error \ org-gnome-proxy.error \ org-gnome-proxy-login.error \ org-gnome-mail-retract.error @@ -73,7 +72,6 @@ EXTRA_DIST = \ org-gnome-compose-send-options.xml \ org-gnome-groupwise-features.eplug.xml \ org-gnome-shared-folder.error.xml \ - org-gnome-process-meeting.error.xml \ org-gnome-proxy.error.xml \ org-gnome-proxy-login.error.xml \ org-gnome-mail-retract.error.xml diff --git a/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml b/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml index 226872b6a8..8bb6651acf 100644 --- a/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml +++ b/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml @@ -10,7 +10,7 @@ <author name="Shreyas Srinivasan" email="sshreyas@novell.com"/> <author name="Raghavendran R" email="raghavguru7@gmail.com"/> - <_description>A plugin for the features in GroupWise accounts.</_description> + <_description>Fine-tune your GroupWise accounts.</_description> <hook class="org.gnome.evolution.mail.config:1.0"> <group id="org.gnome.evolution.mail.folderConfig" target="folder" check= "shared_folder_check" |