diff options
author | Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> | 2013-01-23 12:57:19 -0500 |
---|---|---|
committer | Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> | 2013-01-23 12:57:19 -0500 |
commit | 1c9c770b6f15b6743997eb5a9c9c8d1faa57ebd7 (patch) | |
tree | e6070a75b148a3c49aaa29c4b2cefcc9c886072e /docs/reference/tmpl | |
parent | ee33a9adfc9c657c3be11a8bcaf25e687fdde026 (diff) | |
parent | 6a86412258be37bb971c41b8f0ebd0a19a1463d2 (diff) | |
download | libayatana-appindicator-1c9c770b6f15b6743997eb5a9c9c8d1faa57ebd7.tar.gz libayatana-appindicator-1c9c770b6f15b6743997eb5a9c9c8d1faa57ebd7.tar.bz2 libayatana-appindicator-1c9c770b6f15b6743997eb5a9c9c8d1faa57ebd7.zip |
resolve conflicts on acinclude.m4
Diffstat (limited to 'docs/reference/tmpl')
-rw-r--r-- | docs/reference/tmpl/libappindicator-unused.sgml | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/docs/reference/tmpl/libappindicator-unused.sgml b/docs/reference/tmpl/libappindicator-unused.sgml deleted file mode 100644 index 789a03f..0000000 --- a/docs/reference/tmpl/libappindicator-unused.sgml +++ /dev/null @@ -1,42 +0,0 @@ -<!-- ##### MACRO APP_INDICATOR_SIGNAL_NEW_ACCESSIBLE_DESC ##### --> -<para> - -</para> - - -<!-- ##### SIGNAL AppIndicator::new-accessible-desc ##### --> -<para> - -</para> - -@appindicator: the object which received the signal. -@arg1: - -<!-- ##### ARG AppIndicator:accessible-desc ##### --> -<para> - -</para> - - -<!-- ##### ARG AppIndicator:icon-path ##### --> -<para> - -</para> - - -<!-- ##### FUNCTION app_indicator_get_accessible_desc ##### --> -<para> - -</para> - -@self: -@Returns: - -<!-- ##### FUNCTION app_indicator_set_accessible_desc ##### --> -<para> - -</para> - -@self: -@accessible_desc: - |