Commit c957eb0a authored by Simon McVittie's avatar Simon McVittie

Merge branch 'master' into next

Conflicts:
	spec/Connection_Interface_Renaming1.xml
parents f00ea397 b65310ab
......@@ -18,9 +18,9 @@ Lesser General Public License for more details.</p>
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p>
</tp:license>
<interface name="im.telepathy1.Connection.Interface.Renaming1"
tp:causes-havoc='not well-tested'>
<interface name="im.telepathy1.Connection.Interface.Renaming1">
<tp:requires interface="im.telepathy1.Connection"/>
<tp:added version="0.UNRELEASED">(as stable API)</tp:added>
<signal name="Renamed" tp:name-for-bindings="Renamed">
<arg name="Original" type="u" tp:type="Contact_Handle">
<tp:docstring>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment