summaryrefslogtreecommitdiff
path: root/Events/XDC2014/Attendees.mdwn
diff options
context:
space:
mode:
authormperes <mperes@web>2014-09-09 00:50:49 -0700
committerxorg <iki-xorg@freedesktop.org>2014-09-09 00:50:49 -0700
commitc8b11d8a595846a57783b1e9f4594f51cbc4ba1a (patch)
tree3dcfc9e608bdc5bf64e6960736865bd32385670c /Events/XDC2014/Attendees.mdwn
parent9151032cc2bf5c99be2f6f84c49756fc62a4e797 (diff)
Add Marie
Diffstat (limited to 'Events/XDC2014/Attendees.mdwn')
-rw-r--r--Events/XDC2014/Attendees.mdwn1
1 files changed, 1 insertions, 0 deletions
diff --git a/Events/XDC2014/Attendees.mdwn b/Events/XDC2014/Attendees.mdwn
index 99992a3e..3fbcb333 100644
--- a/Events/XDC2014/Attendees.mdwn
+++ b/Events/XDC2014/Attendees.mdwn
@@ -9,6 +9,7 @@ Please put your name on the list **before September 28th** in order to give us e
1. Eric Anholt (Broadcom)
1. Manuel Bachmann (Eurogiciel) - GUIs / Tizen
1. Sébastien Béchet (Osinix)
+1. Marie Beurton-Aimar (LaBRI)
1. Nyah Check (EVoC Student) - Shatter X-Server
1. Rob Clark (Red Hat)
1. Alan Coopersmith (Oracle)