summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Schaller <christian.schaller@collabora.co.uk>2010-07-23 09:17:46 +0100
committerChristian Schaller <christian.schaller@collabora.co.uk>2010-07-23 09:17:46 +0100
commitd076df9b0fbb0af4dc6e265e789b2b30f67c9434 (patch)
tree458cad7c74f527dee7abb048fe6135b169d4e2d0
parentd7eae3e1a9d5d93da357e9512b1285022f871696 (diff)
Add information about talks that happens as part of CE Linux
-rw-r--r--src/htdocs/conference/index.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/htdocs/conference/index.xml b/src/htdocs/conference/index.xml
index f13ecd25..25bb1ae0 100644
--- a/src/htdocs/conference/index.xml
+++ b/src/htdocs/conference/index.xml
@@ -42,7 +42,7 @@ We have a long list of topics to be presented like:</p>
</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.
+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.
</p>
<h2>Registration</h2>
<p>