X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=Affiliations;h=3523ef3cbc79f5e5a9fc67355dd0698918682d1f;hb=9a688310a4bf5f0d5c7adcb9fa422a82ec3f1fce;hp=8a1512a4c6343ed09e7ee1583ebc3804835d8042;hpb=5c6ed3099dd17e4ed33b1bb965aed2bde568159d;p=wiki.git

diff --git a/Affiliations b/Affiliations
index 8a1512a..3523ef3 100644
--- a/Affiliations
+++ b/Affiliations
@@ -1,4 +1,74 @@
- * Infrastructure Team coordinator, member of the Oversight Board, [[http://wiki.sugarlabs.org/ | Sugar Labs]]
- * System administrator Intern, [[http://fsf.org/ | Free Software Foundation]]
- * Founder, [[http://www.develer.com/ | Develer s.r.l.]]
- * Proven Packager and Sponsor, [[http://www.fedoraproject.org/ | Fedora Project]]
+== Current Affiliations ==
+
+Senior Firmware Engineer, Starship Avionics, [[http://spacex.com/ | SpaceX]]
+
+[[https://spacex.com/ | spacex-logo-small.png]]
+
+---
+
+Coordinator of the Infrastructure Team, Member of the Oversight Board, [[http://wiki.sugarlabs.org/ | Sugar Labs]]
+
+[[https://wiki.sugarlabs.org/ | http://static.sugarlabs.org/images/sugarlabs_trac_logo.png]]
+
+---
+
+Member, [[https://fsf.org/ | Free Software Foundation]]
+
+[[https://fsf.org/ | https://static.fsf.org/fsforg/img/logo-new.png]]
+
+---
+
+Proven Packager, Sponsor, [[http://www.fedoraproject.org/ | Fedora Project]]
+
+[[https://fedoraproject.org | fedora-logo-small.png]]
+
+---
+
+Lead Architect, [[https://github.com/develersrl/bertos | BeRTOS]]
+
+[[https://github.com/develersrl/bertos | bertos-logo-small.png]]
+
+---
+
+Maintainer, [[https://gcc.gnu.org/ | GNU C Compiler]]
+
+[[https://gcc.gnu.org/ | https://upload.wikimedia.org/wikipedia/commons/thumb/a/af/GNU_Compiler_Collection_logo.svg/102px-GNU_Compiler_Collection_logo.svg.png]]
+
+
+== Former Affiliations ==
+
+Senior Software Engineer, [[https://careers.google.com/locations/tokyo/ | Google Japan]]
+
+Senior Software Engineer, [[https://careers.google.com/locations/cambridge/ | Google Cambridge]]
+
+[[https://www.google.com/ | GoogleLogoAlpha.png]]
+
+---
+
+Senior Systems Administrator, [[http://fsf.org/ | Free Software Foundation]]
+
+[[https://fsf.org/ | http://static.fsf.org/fsforg/img/logo-new.png]]
+
+---
+
+Co-Founder, [[https://www.develer.com/ | Develer s.r.l.]]
+
+[[https://www.develer.com/ | develer-logo.png]]
+
+---
+
+Release Manager, [[ http://paraguayeduca.org | Paraguay Educa ]]
+
+[[http://paraguayeduca.org | paraguay-educa-logo-small.png]]
+
+---
+
+Linux Platform Engineer (full-time volunteer), [[http://laptop.org/ | One Laptop Per Child]]
+
+[[https://laptop.org/ | OlpcLogoAlpha.png]]
+
+---
+
+Contributor, [[http://uclinux.org/ | uClinux]]
+
+[[http://www.uclinux.org/ | uclinux-logo.png]]
\ No newline at end of file