diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2016-02-24 19:19:21 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2016-02-24 19:19:21 +0100 |
| commit | 07cd74da368b1baca286cedf6d743a48792d15f5 (patch) | |
| tree | 27162d59cd32f53493977b6fe7a50420de0eb5cf /documentation.mdwn | |
| parent | e21fadaf306d17c53055153bd1fe3797886eeb26 (diff) | |
| parent | e164cc3bc34b10fb415d146dcc1db3abe12fb1d2 (diff) | |
Merge commit 'e21fadaf306d17c53055153bd1fe3797886eeb26'; commit 'e164cc3bc34b10fb415d146dcc1db3abe12fb1d2' into HEAD
Diffstat (limited to 'documentation.mdwn')
| -rw-r--r-- | documentation.mdwn | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/documentation.mdwn b/documentation.mdwn index b27ad8f3..7d4e16ca 100644 --- a/documentation.mdwn +++ b/documentation.mdwn @@ -84,6 +84,10 @@ from userlandish interfaces (Hurd) or from the micro kernel itself (Mach). # Presentations +## 2016 + + * FOSDEM: {{$community/meetings/fosdem_2016#thibault_hurd}} + ## 2015 * FOSDEM: {{$community/meetings/fosdem_2015#thibault_hurd}} |