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

diff --git a/Affiliations b/Affiliations
index 34b64ab..3523ef3 100644
--- a/Affiliations
+++ b/Affiliations
@@ -1,65 +1,74 @@
 == Current Affiliations ==
 
-Software Engineer, [[https://careers.google.com/locations/tokyo/ | Google Japan]]
+Senior Firmware Engineer, Starship Avionics, [[http://spacex.com/ | SpaceX]]
 
-[[https://www.google.com/ | GoogleLogoAlpha.png]]
+[[https://spacex.com/ | spacex-logo-small.png]]
 
-----
+---
 
 Coordinator of the Infrastructure Team, Member of the Oversight Board, [[http://wiki.sugarlabs.org/ | Sugar Labs]]
 
-[[http://wiki.sugarlabs.org/ | http://static.sugarlabs.org/images/sugarlabs_trac_logo.png]]
+[[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 | https://fedoraproject.org/w/uploads/thumb/2/2d/Logo_fedoralogo.png/320px-Logo_fedoralogo.png ]]
-
-----
-
-Founder, [[http://www.develer.com/ | Develer s.r.l.]]
-
-[[https://www.develer.com/ | https://www.develer.com/static/24cd940103cdcce952fb151fbc08e1bea2e14640/dist/logos-s110a2ffa1b.png]]
+[[https://fedoraproject.org | fedora-logo-small.png]]
 
-----
+---
 
-Contributor, former System Architect, [[https://github.com/develersrl/bertos | BeRTOS]]
+Lead Architect, [[https://github.com/develersrl/bertos | BeRTOS]]
 
-[[https://github.com/develersrl/bertos | http://www.bertos.org/media/bertos/avatars/bertos-en.png]]
+[[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]]
 
-[[http://fsf.org/ | http://static.fsf.org/fsforg/img/logo-new.png]]
+[[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 | http://paraguayeduca.org/wp-content/themes/paraguayeduca/img/logo-header.png]]
+[[http://paraguayeduca.org | paraguay-educa-logo-small.png]]
 
-----
+---
 
-Operating System Engineer (full-time volunteer), [[http://laptop.org/ | One Laptop Per Child]]
+Linux Platform Engineer (full-time volunteer), [[http://laptop.org/ | One Laptop Per Child]]
 
 [[https://laptop.org/ | OlpcLogoAlpha.png]]
 
-----
+---
 
 Contributor, [[http://uclinux.org/ | uClinux]]
 
-[[https://uclinux.org/ | https://www.uclinux.org/images/logo.gif]]
\ No newline at end of file
+[[http://www.uclinux.org/ | uclinux-logo.png]]
\ No newline at end of file