From bf30a4f2e7a6594eb69b44f09b372a6db708d4d5 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Tue, 25 Oct 2011 12:26:44 +0530
Subject: Regenerate CDAC talk.

---
 blends/talk/cdac/index.html | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

(limited to 'blends')

diff --git a/blends/talk/cdac/index.html b/blends/talk/cdac/index.html
index edb79fe..62eaa82 100644
--- a/blends/talk/cdac/index.html
+++ b/blends/talk/cdac/index.html
@@ -26,6 +26,7 @@ Jonas Smedegaard
 <li>Free Software</li>
 <li>FLOSS</li>
 <li>Debian - distro &amp; community</li>
+<li>The bigger picture</li>
 </ul>
 </div>
 <div class="slide">
@@ -112,6 +113,39 @@ Jonas Smedegaard
 </ul>
 </div>
 <div class="slide">
+<h1 id="debian---derivatives">Debian - derivatives</h1>
+<ul>
+<li>Knoppix</li>
+<li>Ubuntu</li>
+<li>BOSS</li>
+<li>...</li>
+</ul>
+</div>
+<div class="slide">
+<h1 id="debian---blends">Debian - blends</h1>
+<ul>
+<li>Debian Jr</li>
+<li>Debian Med</li>
+<li>Debian Edu</li>
+<li>Debian Science</li>
+<li>Debian EzGo</li>
+<li>BrDesktop</li>
+<li>Debian Accessibility</li>
+<li>Debian Lex</li>
+<li>DebiChem</li>
+<li>Debian GIS</li>
+<li>Debian Multimedia</li>
+</ul>
+</div>
+<div class="slide">
+<h1 id="debian---future-blends">Debian - future blends</h1>
+<ul>
+<li>FreedomBox</li>
+<li>Debian LAN</li>
+<li>BOSS?</li>
+</ul>
+</div>
+<div class="slide">
 <h1 id="debian-in-a-larger-perspective">Debian in a larger perspective</h1>
 <div class="figure">
 <img src="../developmentstream.svg" alt="Software Development Stream" /><p class="caption">Software Development Stream</p>
@@ -133,7 +167,8 @@ document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'">'+'<code>'+e+'</code>'+'<\/'+
 // -->
 </script><noscript>&#100;&#114;&#32;&#x61;&#116;&#32;&#106;&#x6f;&#110;&#x65;&#x73;&#32;&#100;&#x6f;&#116;&#32;&#100;&#x6b;</noscript></li>
 <li>Debian: <a href="http://www.debian.org"><code class="url">http://www.debian.org</code></a></li>
-<li>This talk: <a href="http://dr.jones.dk/blends/talk/hcu"><code class="url">http://dr.jones.dk/blends/talk/hcu</code></a></li>
+<li>This talk: <a href="http://dr.jones.dk/blends/talk/cdac"><code class="url">http://dr.jones.dk/blends/talk/cdac</code></a></li>
+<li>Graphics: <a href="http://sirireiter.dk/blog/entry/110310/"><code class="url">http://sirireiter.dk/blog/entry/110310/</code></a></li>
 </ul>
 </div>
 </body>
-- 
cgit v1.2.3