- From: Mercurial notifier <cvsmail@w3.org>
- Date: Thu, 17 Jan 2013 14:08:47 +0000
- To: public-dap-commits@w3.org
changeset: 331:43b139afeba9
user: Rich Tibbett <richt@opera.com>
date: Thu Jan 17 15:07:19 2013 +0100
files: discovery-api/Overview.src.html
description:
Apply DIAL protocol support patch
diff -r 78129450e57a -r 43b139afeba9 discovery-api/Overview.src.html
--- a/discovery-api/Overview.src.html Thu Oct 25 19:49:39 2012 +0200
+++ b/discovery-api/Overview.src.html Thu Jan 17 15:07:19 2013 +0100
@@ -34,13 +34,8 @@
<script type="text/javascript"
class='remove'>
var respecConfig = {
-<<<<<<< local
- specStatus: "WD",
- publishDate: "2012-10-04",
-=======
specStatus: "ED",
//publishDate: "2012-10-04",
->>>>>>> other
shortName: "discovery-api",
edDraftURI: "http://dvcs.w3.org/hg/dap/raw-file/tip/discovery-api/Overview.html",
previousMaturity: "FPWD",
Received on Thursday, 17 January 2013 14:08:49 UTC