aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorv0tti <alex@alexandervotteler.de>2016-08-28 14:18:13 +0200
committerv0tti <alex@alexandervotteler.de>2016-08-28 14:18:13 +0200
commitc44e4ede05584aedb300e36c8116763761eff62a (patch)
tree4b59f63f356d0690fd8c359f425f57d4b3efc884
parentb19de71e988150d84d5f8c71c5d9981840ecdad5 (diff)
Add Voctomix Talk
Add @MaZderMind Talk about Voctomix from Froscon 2016 to the ReadMe
-rwxr-xr-xREADME.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/README.md b/README.md
index 86a2c53..aae37f5 100755
--- a/README.md
+++ b/README.md
@@ -93,4 +93,4 @@ While the Core runs fine inside any VM, the GUI uses OpenGL to display the video
## Contact
To get in touch with us we'd ask to join `#voctomix` on the hackint IRC network, mail to `voc AT c3voc DOT de` or meet us on one of the [many conferences](https://c3voc.de/eventkalender) we're at.
-You may also want to watch [a presentation](https://media.ccc.de/v/froscon2015-1520-conference_recording_und_streaming#video) some of us gave about our video infrastructure.
+You may also want to watch MaZderMinds [talk](https://media.ccc.de/v/froscon2016-1696-voctomix) about Voctomix and [a presentation](https://media.ccc.de/v/froscon2015-1520-conference_recording_und_streaming) some of us gave about C3VOCs video infrastructure.