From 1b99871afe13145db29aeb69559f3cf45adda9ff Mon Sep 17 00:00:00 2001
From: Alon Zakai <alonzakai@gmail.com>
Date: Mon, 8 Sep 2014 21:28:47 -0700
Subject: [PATCH] add link to cppcon slides

---
 .../docs/introducing_emscripten/Talks-and-Publications.rst       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/source/docs/introducing_emscripten/Talks-and-Publications.rst b/site/source/docs/introducing_emscripten/Talks-and-Publications.rst
index 2a1e86a6a..c30ade8a4 100644
--- a/site/source/docs/introducing_emscripten/Talks-and-Publications.rst
+++ b/site/source/docs/introducing_emscripten/Talks-and-Publications.rst
@@ -7,6 +7,7 @@ Talks and Publications
 Presentations
 =============
 
+- Slides from CppCon 2014: `Emscripten & asm.js: C++'s role in the modern web <http://kripken.github.io/mloc_emscripten_talk/cppcon.html>`_ (`kripken <https://github.com/kripken>`_)
 - Slides from GDC 2014: `Getting started with asm.js and Emscripten <http://people.mozilla.org/~lwagner/gdc-pres/gdc-2014.html#/>`_ (`kripken <https://github.com/kripken>`_, `lwagner <https://blog.mozilla.org/luke/>`_)
 - Slides from Strange Loop 2013: `Native speed on the web, JavaScript and asm.js <http://kripken.github.io/mloc_emscripten_talk/sloop.html#/>`_ (`kripken <https://github.com/kripken>`_)	
 - Slides from GDC Europe 2013: `C++ on the Web <http://www.slideshare.net/andreweissflog3/gdce2013-cpp-ontheweb>`_ (`floh <https://github.com/floooh>`_)