summaryrefslogtreecommitdiff
path: root/community/meetings
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2016-02-24 19:19:21 +0100
committerThomas Schwinge <thomas@codesourcery.com>2016-02-24 19:19:21 +0100
commit07cd74da368b1baca286cedf6d743a48792d15f5 (patch)
tree27162d59cd32f53493977b6fe7a50420de0eb5cf /community/meetings
parente21fadaf306d17c53055153bd1fe3797886eeb26 (diff)
parente164cc3bc34b10fb415d146dcc1db3abe12fb1d2 (diff)
Merge commit 'e21fadaf306d17c53055153bd1fe3797886eeb26'; commit 'e164cc3bc34b10fb415d146dcc1db3abe12fb1d2' into HEAD
Diffstat (limited to 'community/meetings')
-rw-r--r--community/meetings/fosdem_2016.mdwn3
1 files changed, 2 insertions, 1 deletions
diff --git a/community/meetings/fosdem_2016.mdwn b/community/meetings/fosdem_2016.mdwn
index 361167ba..f175af09 100644
--- a/community/meetings/fosdem_2016.mdwn
+++ b/community/meetings/fosdem_2016.mdwn
@@ -22,6 +22,7 @@ Bruxelles.
[[!table class="table_style_1" data="""
"Name","Attending","Arrival","Return"
"Samuel Thibault","yes","Saturday, 09:17 BRU","Sunday, 19:13 BRU"
+"[[Thomas Schwinge|tschwinge]]","yes","Friday, 17:35, Bruxelles Midi","Sunday, 18:25, Bruxelles Midi"
"""]]
@@ -36,6 +37,6 @@ Bruxelles.
thibault_hurd:
- "presentation by Samuel Thibault: [*Hurd, Rump kernel, sound, and usb*]"
+ "presentation by Samuel Thibault: [*Hurd, Rump kernel, sound, and usb*]"(https://fosdem.org/2016/schedule/event/microkernels_hurd_rump_sound_usb/) ([slides](https://fosdem.org/2016/schedule/event/microkernels_hurd_rump_sound_usb/attachments/slides/951/export/events/attachments/microkernels_hurd_rump_sound_usb/slides/951/2016_01_30_fosdem.pdf))
"""]]