diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-05-02 12:56:55 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-05-02 12:56:55 +0800 |
| commit | f5ca8fdc13fa9d29dfb9fc941a01dbb64833b6ea (patch) | |
| tree | 91036c36e2a40ee98dda5788ac5df66d536ee8af /plugins | |
| parent | 15af330cacae649e86d4d89a7a8c7f1795baa7ca (diff) | |
| download | gsoc2013-evolution-f5ca8fdc13fa9d29dfb9fc941a01dbb64833b6ea.tar gsoc2013-evolution-f5ca8fdc13fa9d29dfb9fc941a01dbb64833b6ea.tar.gz gsoc2013-evolution-f5ca8fdc13fa9d29dfb9fc941a01dbb64833b6ea.tar.bz2 gsoc2013-evolution-f5ca8fdc13fa9d29dfb9fc941a01dbb64833b6ea.tar.lz gsoc2013-evolution-f5ca8fdc13fa9d29dfb9fc941a01dbb64833b6ea.tar.xz gsoc2013-evolution-f5ca8fdc13fa9d29dfb9fc941a01dbb64833b6ea.tar.zst gsoc2013-evolution-f5ca8fdc13fa9d29dfb9fc941a01dbb64833b6ea.zip | |
Merge changes from master.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/external-editor/org-gnome-external-editor.xml | 17 | ||||
| -rw-r--r-- | plugins/groupwise-features/Makefile.am | 2 |
2 files changed, 1 insertions, 18 deletions
diff --git a/plugins/external-editor/org-gnome-external-editor.xml b/plugins/external-editor/org-gnome-external-editor.xml deleted file mode 100644 index e472f8bd1c..0000000000 --- a/plugins/external-editor/org-gnome-external-editor.xml +++ /dev/null @@ -1,17 +0,0 @@ -<Root> - <commands> - - <cmd name="EPExtEditor" _label="Compose in _External Editor" - _tip="Compose messages using an external editor" - pixtype="pixmap"/> - - </commands> - - <menu> - <submenu name="File"> - <placeholder name="FileOps"> - <menuitem name="EPExtEditor" verb=""/> - </placeholder> - </submenu> - </menu> -</Root> diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am index d18a7c87f4..eb8c7aeba2 100644 --- a/plugins/groupwise-features/Makefile.am +++ b/plugins/groupwise-features/Makefile.am @@ -70,7 +70,7 @@ error_DATA = \ errordir = $(privdatadir)/errors -BUILT_SOURCES = org-gnome-groupwise-features.eplug $(error_i18n) +BUILT_SOURCES = org-gnome-groupwise-features.eplug $(error_DATA) EXTRA_DIST = \ $(glade_DATA) \ |