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

html5/2dcontext Overview.html,1.149,1.150

From: Sam Ruby via cvs-syncmail <cvsmail@w3.org>
Date: Fri, 07 Sep 2012 19:44:07 +0000
To: public-html-commits@w3.org
Message-Id: <E1TA4TH-0004EI-Cc@lionel-hutz.w3.org>
Update of /sources/public/html5/2dcontext
In directory hutz:/tmp/cvs-serv16235

Modified Files:
	Overview.html 
Log Message:
commit 04a0852a7bd5a57e29d2a218143f284394ed5968
Author: Silvia Pfeiffer <silviapfeiffer1@gmail.com>
Date:   Sat Sep 8 05:13:51 2012 +1000

    Fix merge error.


Index: Overview.html
===================================================================
RCS file: /sources/public/html5/2dcontext/Overview.html,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- Overview.html	7 Sep 2012 00:14:17 -0000	1.149
+++ Overview.html	7 Sep 2012 19:44:05 -0000	1.150
@@ -5943,6 +5943,14 @@
    <dt id=refsMIMESNIFF>[MIMESNIFF]</dt>
    <dd><cite><a href=http://mimesniff.spec.whatwg.org/>MIME Sniffing</a></cite>, A. Barth, I. Hickson. WHATWG.</dd>
 
+   <dt id=refsMPEG2>[MPEG2]</dt>
+   <dd><cite>ISO/IEC 13818-1: Information technology — Generic coding of moving pictures and associated audio information: Systems</cite>. ISO/IEC.</dd>
+   <!-- search for ["bytes are removed from this buffer at a rate defined by sb_leak_rate"] to find it -->
+
+   <dt id=refsMPEG4>[MPEG4]</dt>
+   <dd><cite>ISO/IEC 14496-12: ISO base media file format</cite>. ISO/IEC.</dd>
+   <!-- search for ["Box Structure was and subsequent clauses were re-organized"] to find it -->
+
    <dt id=refsMQ>[MQ]</dt>
    <!--
    <dd><cite><a href="http://www.w3.org/TR/css3-mediaqueries/">Media
@@ -5962,7 +5970,7 @@
    Work in progress. <!--!-->
    </dd>
 
-   <dt id=refsOGGROLE>[OGGROLE]</dt>
+   <dt id=refsOGGSKELETONHEADERS>[OGGSKELETONHEADERS]</dt>
    <dd><cite><a href=http://wiki.xiph.org/SkeletonHeaders>SkeletonHeaders</a></cite>. Xiph.Org.</dd>
 
    <dt id=refsOPENSEARCH>[OPENSEARCH]</dt>
Received on Friday, 7 September 2012 19:44:11 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Friday, 7 September 2012 19:44:11 GMT