X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=Affiliations;h=3523ef3cbc79f5e5a9fc67355dd0698918682d1f;hb=3ad53baaf8028be05de3b5d441e499e6b5de09f5;hp=ddbae93b5f529c878e2d60d3a6334c7609a910fb;hpb=cdcc9b021203f7aeb0df0686ed2fdcc890c5d266;p=wiki.git

diff --git a/Affiliations b/Affiliations
index ddbae93..3523ef3 100644
--- a/Affiliations
+++ b/Affiliations
@@ -1,35 +1,74 @@
 == Current Affiliations ==
 
-Infrastructure Team coordinator, member of the Oversight Board, [[http://wiki.sugarlabs.org/ | Sugar Labs]]
+Senior Firmware Engineer, Starship Avionics, [[http://spacex.com/ | SpaceX]]
 
-[[http://wiki.sugarlabs.org/ | http://static.sugarlabs.org/images/sugarlabs_trac_logo.png]]
+[[https://spacex.com/ | spacex-logo-small.png]]
 
-----
+---
 
-System Administrator Intern, [[http://fsf.org/ | Free Software Foundation]]
+Coordinator of the Infrastructure Team, Member of the Oversight Board, [[http://wiki.sugarlabs.org/ | Sugar Labs]]
 
-[[http://fsf.org/ | http://static.fsf.org/fsforg/img/logo-new.png]]
+[[https://wiki.sugarlabs.org/ | http://static.sugarlabs.org/images/sugarlabs_trac_logo.png]]
 
-----
+---
 
-Founder, [[http://www.develer.com/ | Develer s.r.l. ]]
+Member, [[https://fsf.org/ | Free Software Foundation]]
 
-[[http://www.develer.com/ | http://www.develer.com/pics/develer_logo_alpha.png]]
+[[https://fsf.org/ | https://static.fsf.org/fsforg/img/logo-new.png]]
 
-----
+---
 
 Proven Packager, Sponsor, [[http://www.fedoraproject.org/ | Fedora Project]]
 
-[[http://fedoraproject.org | http://fedoraproject.org/w/uploads/thumb/2/2d/Logo_fedoralogo.png/320px-Logo_fedoralogo.png ]]
+[[https://fedoraproject.org | fedora-logo-small.png]]
 
-----
+---
 
-Maintainer, [[http://gcc.gnu.org/ | GNU C Compiler]]
+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]]
 
-[[http://gcc.gnu.org/ | http://upload.wikimedia.org/wikipedia/commons/c/c4/GCC_logo.png]]
 
 == Former Affiliations ==
 
- * Contributor, [[http://uclinux.org/ | uClinux]]
+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]]
 
- * Developer, [[http://laptop.org/ | OLPC]]
+[[http://www.uclinux.org/ | uclinux-logo.png]]
\ No newline at end of file