diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2014-02-26 20:13:52 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2014-02-26 20:13:52 +0100 |
| commit | 4b1317d9ab1a9ee409634de0962c964b8d801ba0 (patch) | |
| tree | ac0fe0f7a686571533bef3450c267781895a6ba1 /community/meetings | |
| parent | c73e48c85d76a6b61a9fe7ddb7a98038a342a1c8 (diff) | |
| parent | c954f1095918874c73511ffc13f95eef518a8043 (diff) | |
Merge commit 'c954f1095918874c73511ffc13f95eef518a8043'
Conflicts:
community/meetings.mdwn
Diffstat (limited to 'community/meetings')
| -rw-r--r-- | community/meetings/fosdem_2013.mdwn | 3 | ||||
| -rw-r--r-- | community/meetings/fosdem_2014.mdwn | 14 |
2 files changed, 14 insertions, 3 deletions
diff --git a/community/meetings/fosdem_2013.mdwn b/community/meetings/fosdem_2013.mdwn index 0ac36838..2d55e76b 100644 --- a/community/meetings/fosdem_2013.mdwn +++ b/community/meetings/fosdem_2013.mdwn @@ -1,4 +1,5 @@ -[[!meta copyright="Copyright © 2012, 2013 Free Software Foundation, Inc."]] +[[!meta copyright="Copyright © 2012, 2013, 2014 Free Software Foundation, +Inc."]] [[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable id="license" text="Permission is granted to copy, distribute and/or modify this diff --git a/community/meetings/fosdem_2014.mdwn b/community/meetings/fosdem_2014.mdwn index 1379968e..655c8e2e 100644 --- a/community/meetings/fosdem_2014.mdwn +++ b/community/meetings/fosdem_2014.mdwn @@ -1,4 +1,5 @@ -[[!meta copyright="Copyright © 2012, 2013 Free Software Foundation, Inc."]] +[[!meta copyright="Copyright © 2012, 2013, 2014 Free Software Foundation, +Inc."]] [[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable id="license" text="Permission is granted to copy, distribute and/or modify this @@ -20,10 +21,19 @@ Bruxelles. [[!table class="table_style_1" data=""" "Name","Attending","Arrival","Return" +"Samuel Thibault","yes","Saturday morning","Sunday evening" +"Thomas Schwinge","yes","Friday, 16:20, BRU","Sunday, 20:15, BRU" """]] -# Devroom: Microkernel and component-based operating systems +# Microkernel-based operating systems devroom [[!message-id desc="Announcement and CfP" "5255453A.70302@os.inf.tu-dresden.de"]]. + +<https://fosdem.org/2014/schedule/track/microkernel_based_operating_systems/> + + +## GNU/Hurd DDE userland device drivers (Samuel Thibault) + +<https://fosdem.org/2014/schedule/event/07_uk_dde_on_hurd/> |