Apply DIAL protocol support patch
authorRich Tibbett <richt@opera.com>
Thu, 17 Jan 2013 15:07:19 +0100
changeset 33143b139afeba9
parent 330 78129450e57a
child 332 e19dc529aacc
Apply DIAL protocol support patch
discovery-api/Overview.src.html
     1.1 --- a/discovery-api/Overview.src.html	Thu Oct 25 19:49:39 2012 +0200
     1.2 +++ b/discovery-api/Overview.src.html	Thu Jan 17 15:07:19 2013 +0100
     1.3 @@ -34,13 +34,8 @@
     1.4      <script type="text/javascript"
     1.5            class='remove'>
     1.6  var respecConfig = {
     1.7 -<<<<<<< local
     1.8 -          specStatus:   "WD",
     1.9 -          publishDate:  "2012-10-04",
    1.10 -=======
    1.11            specStatus:   "ED",
    1.12            //publishDate:  "2012-10-04",
    1.13 ->>>>>>> other
    1.14            shortName:    "discovery-api",
    1.15            edDraftURI:   "http://dvcs.w3.org/hg/dap/raw-file/tip/discovery-api/Overview.html",
    1.16            previousMaturity: "FPWD",