summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Schaller <christian.schaller@collabora.co.uk>2010-08-24 12:11:48 +0100
committerChristian Schaller <christian.schaller@collabora.co.uk>2010-08-24 12:11:48 +0100
commitab277ce80c418915dade107547c9200ac70d4dd3 (patch)
tree1c192f9dfb59834ba84dd9c9c437b0dd432778fe
parent7d1220b61a17b1e25411547903d0ddcddfa2ae44 (diff)
Misc fixes and update conference front page
-rw-r--r--src/htdocs/conference/gstreamer-conference-timetable.xml2
-rw-r--r--src/htdocs/conference/index.xml9
2 files changed, 8 insertions, 3 deletions
diff --git a/src/htdocs/conference/gstreamer-conference-timetable.xml b/src/htdocs/conference/gstreamer-conference-timetable.xml
index fba69b22..6ed11bdd 100644
--- a/src/htdocs/conference/gstreamer-conference-timetable.xml
+++ b/src/htdocs/conference/gstreamer-conference-timetable.xml
@@ -170,7 +170,7 @@
</td>
<td rowspan="3" width="33%">
<p>Case Study - <a href="http://gstreamer.freedesktop.org/conference/speakers.html#torra">
- Intel SMD elements in GStreamer, Josep Torra</a>, Fluendo</p>
+ Intel SIMD elements in GStreamer, Josep Torra</a>, Fluendo</p>
</td>
</tr>
<tr valign="top">
diff --git a/src/htdocs/conference/index.xml b/src/htdocs/conference/index.xml
index 7318fea4..4241795b 100644
--- a/src/htdocs/conference/index.xml
+++ b/src/htdocs/conference/index.xml
@@ -41,8 +41,13 @@ We have a long list of topics to be presented like:</p>
<li>Case studies on GStreamer product deployments</li>
</ul>
<p>
-The <a href="gstreamer-conference-timetable.html">full GStreamer conference program is now online</a>. We got a
-wonderful list of speakers so we hope as many of you as possible will be attending. In addition to the talks at the GStreamer Conference day there are quite a few very interesting talks happening as part of CE Linux also, like Benjamin Gaignard of ST Ericsson talking about Android and GStreamer, Stefan Kost of Nokia talking about Meego and GStreamer and Arun Raghavan from Collabora Multimedia speaking about Pulse Audio. So be sure to register for both events.
+Both the <a href="gstreamer-conference-timetable.html">full GStreamer conference timetable</a> and the <a href="speakers.html">full list of
+speakers bios and talk abstracts</a> are now online. We got a wonderful list of speakers so we hope as many of you as possible will be attending.
+In addition to the talks at the GStreamer Conference day there are quite a few very interesting talks happening as part of CE Linux also,
+like Benjamin Gaignard of ST Ericsson talking about <a href="http://www.embeddedlinuxconference.com/elc_europe10/sessions.html#Gaignard">
+Android and GStreamer</a>, Stefan Kost of Nokia talking about <a href="http://www.embeddedlinuxconference.com/elc_europe10/sessions.html#Cost">
+Meego and GStreamer</a> and Arun Raghavan from Collabora Multimedia speaking about
+<a href="http://www.embeddedlinuxconference.com/elc_europe10/sessions.html#Raghavan">Pulse Audio</a>. So be sure to register for both events.
</p>
<h2>Registration</h2>
<p>