diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-10-14 14:43:24 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-10-14 14:43:24 +0100 |
| commit | c957eb0ac681d2aed33cc25ef732ff1d9df13a79 (patch) | |
| tree | ae0518bcc360d6509a2988bd73a39230c3048e95 | |
| parent | f00ea3972134b2d8bfb1468351174fcf9c3d83d0 (diff) | |
| parent | b65310ab9aa6556ccad5abe2ed5c9de1211e51f8 (diff) | |
Merge branch 'master' into next
Conflicts:
spec/Connection_Interface_Renaming1.xml
| -rw-r--r-- | spec/Connection_Interface_Renaming1.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/Connection_Interface_Renaming1.xml b/spec/Connection_Interface_Renaming1.xml index 15b7a9ac..f8e7ca84 100644 --- a/spec/Connection_Interface_Renaming1.xml +++ b/spec/Connection_Interface_Renaming1.xml @@ -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> |