diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-11-04 16:56:40 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-11-04 16:56:40 +0000 |
| commit | 42f0b0850c692549fa9049c735a67ad3dea2e097 (patch) | |
| tree | 197137d97844aff2bf396792974c7822dcc6dae0 | |
| parent | fd0103d3786249bf12a9dc1533c499c10f607cdd (diff) | |
| parent | ddc7bd2879e4344f56d8b759ead4c7c20a699dca (diff) | |
Merge remote-tracking branch 'origin/master' into next
Conflicts:
spec/Connection_Interface_IRC_Command1.xml
| -rw-r--r-- | spec/Connection_Interface_IRC_Command1.xml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/Connection_Interface_IRC_Command1.xml b/spec/Connection_Interface_IRC_Command1.xml index c4fa597b..67bca340 100644 --- a/spec/Connection_Interface_IRC_Command1.xml +++ b/spec/Connection_Interface_IRC_Command1.xml @@ -16,8 +16,7 @@ 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.IRCCommand1" - tp:causes-havoc='not well-tested'> + <interface name="im.telepathy1.Connection.Interface.IRCCommand1"> <tp:requires interface="im.telepathy1.Connection"/> <tp:added version="0.27.3"/> |