W3C home > Mailing lists > Public > public-html-commits@w3.org > September 2012

html5/2dcontext Overview.html,1.156,1.157

From: Sam Ruby via cvs-syncmail <cvsmail@w3.org>
Date: Wed, 12 Sep 2012 19:44:19 +0000
To: public-html-commits@w3.org
Message-Id: <E1TBsrD-0007Ff-7v@lionel-hutz.w3.org>
Update of /sources/public/html5/2dcontext
In directory hutz:/tmp/cvs-serv27834

Modified Files:
	Overview.html 
Log Message:
commit 9f51fffa1e103e7d380798cabfd7c90fa9e8bfee
Author: Jay Munro <jaymunro@microsoft.com>
Date:   Wed Sep 12 12:30:46 2012 -0700

    revert changes  - fixed conflicts
    
    Fixed conflicts of reverted changes.


Index: Overview.html
===================================================================
RCS file: /sources/public/html5/2dcontext/Overview.html,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- Overview.html	12 Sep 2012 18:44:39 -0000	1.156
+++ Overview.html	12 Sep 2012 19:44:17 -0000	1.157
@@ -357,7 +357,7 @@
    and <a href=http://www.w3.org/Consortium/Legal/copyright-documents>document
    use</a> rules apply.</p>
 
-
+</div>
 =======
    <!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
    <p class=alt>The bulk of the text of this specification is also
@@ -365,8 +365,7 @@
    reuse of the specification text.</p>
    <!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
 
-  </div>
-&gt;&gt;&gt;&gt;&gt;&gt;&gt; parent of 04cee20... Boilerplate file updates
+  
 
   <hr class=top><h2 class="no-num no-toc" id=abstract>Abstract</h2>
 
@@ -504,11 +503,9 @@
    <dd>Commit-Watchers mailing list (complete source diffs): <a href=http://lists.whatwg.org/listinfo.cgi/commit-watchers-whatwg.org>http://lists.whatwg.org/listinfo.cgi/commit-watchers-whatwg.org</a></dd>
    <dt>Browsable version-control record of all changes:</dt>
    <dd>CVSWeb interface with side-by-side diffs: <a href=http://dev.w3.org/cvsweb/html5/spec/>http://dev.w3.org/cvsweb/html5/spec/</a></dd>
-Github repository <a href=https://github.com/w3c/html/commits/master>https://github.com/w3c/html/commits/master</a>
-=======
+   <dd>Github repository <a href=https://github.com/w3c/html/commits/master>https://github.com/w3c/html/commits/master</a></dd>
    <dd>Annotated summary with unified diffs: <a href=http://html5.org/tools/web-apps-tracker>http://html5.org/tools/web-apps-tracker</a></dd>
    <dd>Raw Subversion interface: <code>svn checkout http://svn.whatwg.org/webapps/</code></dd>
-&gt;&gt;&gt;&gt;&gt;&gt;&gt; parent of 2009255... Removed and edited comments and text.
   </dl><!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING LIST TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- status of document, group responsible (required) --><p>The W3C <a href=http://www.w3.org/html/wg/>HTML Working
   Group</a> is the W3C working group responsible for this
   specification's progress along the W3C Recommendation
Received on Wednesday, 12 September 2012 19:44:20 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Wednesday, 12 September 2012 19:44:20 GMT