aboutsummaryrefslogtreecommitdiff
path: root/docs/markdown/Conference-presentations.md
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2017-05-04 00:18:00 +0300
committerGitHub <noreply@github.com>2017-05-04 00:18:00 +0300
commit8cb15d728b3cfe9f2b26762ab78490da4628a30d (patch)
tree88ae990db099bb3430a094f6e1e736eb8bbcc063 /docs/markdown/Conference-presentations.md
parent108dac5c162eb086b8cce3f4d0575f7282c72c48 (diff)
parentf9de195d7c5a6ed4b02ea7c87137ac6be7f15d9c (diff)
downloadmeson-8cb15d728b3cfe9f2b26762ab78490da4628a30d.zip
meson-8cb15d728b3cfe9f2b26762ab78490da4628a30d.tar.gz
meson-8cb15d728b3cfe9f2b26762ab78490da4628a30d.tar.bz2
Merge pull request #1723 from QuLogic/doc-updates
Minor documentation updates
Diffstat (limited to 'docs/markdown/Conference-presentations.md')
-rw-r--r--docs/markdown/Conference-presentations.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/markdown/Conference-presentations.md b/docs/markdown/Conference-presentations.md
index b6e725b..15e4396 100644
--- a/docs/markdown/Conference-presentations.md
+++ b/docs/markdown/Conference-presentations.md
@@ -1,17 +1,17 @@
# Conference presentations on Meson
-- Fosdem 2014, [Introducing the Meson build system](http://video.fosdem.org/2014/H2215_Ferrer/Sunday/Introducing_the_Meson_build_system.webm) (jpakkane)
+- FOSDEM 2014, [Introducing the Meson build system](https://video.fosdem.org/2014/H2215_Ferrer/Sunday/Introducing_the_Meson_build_system.webm) (jpakkane)
- LCA 2015, [Making build systems not suck](https://www.youtube.com/watch?v=KPi0AuVpxLI) (jpakkane)
-- Guadec 2015, [Improving the way Gnome apps are built](https://www.youtube.com/watch?v=wTf0NjjNwTU) (jpakkane)
+- GUADEC 2015, [Improving the way Gnome apps are built](https://www.youtube.com/watch?v=wTf0NjjNwTU) (jpakkane)
- GStreamer conference 2015, [Done in 6.0 seconds](https://gstconf.ubicast.tv/videos/done-in-60-seconds-a-new-build-system-for-gstreamer) (jpakkane)
- LCA 2016, [Builds, dependencies and deployment in the modern multiplatform world](https://www.youtube.com/watch?v=CTJtKtQ8R5k&feature=youtu.be) (jpakkane)
-- Guadec 2016, [Making your GNOME app compile 2.4x faster](https://media.ccc.de/v/44-making_your_gnome_app_compile_24x_faster) (nirbheek)
+- GUADEC 2016, [Making your GNOME app compile 2.4x faster](https://media.ccc.de/v/44-making_your_gnome_app_compile_24x_faster) (nirbheek)
- Libre Application Summit 2016, [New world, new tools](https://youtu.be/0-gx1qU2pPo) (jpakkane)
-- Gstreamer conference 2016, [GStreamer Development on Windows and faster builds everywhere with Meson](https://gstconf.ubicast.tv/videos/gstreamer-development-on-windows-ans-faster-builds-everywhere-with-meson/) (tpm)
+- GStreamer conference 2016, [GStreamer Development on Windows and faster builds everywhere with Meson](https://gstconf.ubicast.tv/videos/gstreamer-development-on-windows-ans-faster-builds-everywhere-with-meson/) (tpm)