diff options
| author | MaZderMind <git@mazdermind.de> | 2016-08-28 18:07:07 +0200 |
|---|---|---|
| committer | MaZderMind <git@mazdermind.de> | 2016-08-28 18:07:07 +0200 |
| commit | 40e256a391ce9fd7cc5b6cfeac3d1eaf5fa5bb68 (patch) | |
| tree | 40ec8cbff6e95a89611e37125985e8d52877ef88 | |
| parent | 94093e6e1bf52c324d6c6141996922d35e9edfdf (diff) | |
| parent | c44e4ede05584aedb300e36c8116763761eff62a (diff) | |
Merge branch 'master' of git://github.com/v0tti/voctomix into v0tti-master
| -rwxr-xr-x | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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. |